driver core: faux: stop using static struct device
Greg Kroah-Hartman
maintainerPATCH 1/1 driver core: faux: stop using static struct device
faux_bus_root should not have been a static struct device, but rather a dynamically created structure so that lockdep and other testing tools do not trip over it (as well as being the right thing overall to do.) Fix this up by making it properly dynamic.
--- drivers/base/faux.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/base/faux.c +11 -7
@@ -29,9 +29,7 @@ struct faux_object { };#define to_faux_object (dev) container_of_const(dev, struct faux_object, faux_dev.dev) -static struct device faux_bus_root = { - .init_name ="faux" , -}; +static struct device *faux_bus_root;static int faux_match (struct device *dev,const struct device_driver *drv) {
@@ -152,7 +150,7 @@ struct faux_device *faux_device_create_with_groups(const char *name,if (parent) dev->parent = parent;else - dev->parent = &faux_bus_root; + dev->parent = faux_bus_root; dev->bus = &faux_bus_type;dev_set_name (dev,"%s" , name);device_set_pm_not_required (dev);
@@ -236,9 +234,15 @@ int __init faux_bus_init(void) {int ret; - ret =device_register (&faux_bus_root); + faux_bus_root =kzalloc (sizeof (*faux_bus_root),GFP_KERNEL ); +if (!faux_bus_root) +return -ENOMEM ; + +dev_set_name (faux_bus_root,"faux" ); + + ret =device_register (faux_bus_root);if (ret) { -put_device (&faux_bus_root); +put_device (faux_bus_root);return ret; }
@@ -256,6 +260,6 @@ int __init faux_bus_init(void)bus_unregister (&faux_bus_type); error_bus: -device_unregister (&faux_bus_root); +device_unregister (faux_bus_root);return ret; }
Signature · 1 line
2.52.0
Quoted 6 lines · Greg Kroah-Hartman
faux_bus_rootshould not have been a static struct device, but rather a dynamically created structure so that lockdep and other testing tools do not trip over it (as well as being the right thing overall to do.) Fix this up by making it properly dynamic.Reported-by Gui-Dong Han <[email protected]>
Quoted 1 line
Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 36 lines · On Wed, 21 Jan 2026 11:29:45 +0100 Greg Kroah-Hartman…
faux_bus_rootshould not have been a static struct device, but rather a dynamically created structure so that lockdep and other testing tools do not trip over it (as well as being the right thing overall to do.) Fix this up by making it properly dynamic.Reported-by Gui-Dong Han <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/base/faux.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/base/faux.c +2
-4@@ -29,9 +29,7 @@ struct faux_object { };#define to_faux_object (dev) container_of_const(dev, struct faux_object, faux_dev.dev) -static struct device faux_bus_root = { - .init_name ="faux" , -}; +static struct device *faux_bus_root;static int faux_match (struct device *dev,const struct device_driver *drv) {@@ -152,7 +150,7 @@ struct faux_device *faux_device_create_with_groups(const char *name,if (parent) dev->parent = parent;else - dev->parent = &faux_bus_root; + dev->parent = faux_bus_root; dev->bus = &faux_bus_type;dev_set_name (dev,"%s" , name);device_set_pm_not_required (dev);
drivers/base/faux.c int __init faux_bus_init(void) · line 235
Quoted 2 lines
drivers/base/faux.c +0
-0@@ -236,9 +234,15 @@ int __init faux_bus_init(void) {int ret;
Should there be:
if (faux_bus_root) return -EBUSY;
here?
While I guess there shouldn't be two of these, better be safe.
David
Quoted 23 lines
drivers/base/faux.c +9
-3- ret =device_register (&faux_bus_root); + faux_bus_root =kzalloc (sizeof (*faux_bus_root),GFP_KERNEL ); +if (!faux_bus_root) +return -ENOMEM ; + +dev_set_name (faux_bus_root,"faux" ); + + ret =device_register (faux_bus_root);if (ret) { -put_device (&faux_bus_root); +put_device (faux_bus_root);return ret; }@@ -256,6 +260,6 @@ int __init faux_bus_init(void)bus_unregister (&faux_bus_type); error_bus: -device_unregister (&faux_bus_root); +device_unregister (faux_bus_root);return ret; }
Greg Kroah-Hartman
maintainerQuoted 43 lines · David Laight
Quoted 36 lines · On Wed, 21 Jan 2026 11:29:45 +0100 Greg Kroah-Hartman…
faux_bus_rootshould not have been a static struct device, but rather a dynamically created structure so that lockdep and other testing tools do not trip over it (as well as being the right thing overall to do.) Fix this up by making it properly dynamic.Reported-by Gui-Dong Han <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/base/faux.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/base/faux.c +2
-4@@ -29,9 +29,7 @@ struct faux_object { };#define to_faux_object (dev) container_of_const(dev, struct faux_object, faux_dev.dev) -static struct device faux_bus_root = { - .init_name ="faux" , -}; +static struct device *faux_bus_root;static int faux_match (struct device *dev,const struct device_driver *drv) {@@ -152,7 +150,7 @@ struct faux_device *faux_device_create_with_groups(const char *name,if (parent) dev->parent = parent;else - dev->parent = &faux_bus_root; + dev->parent = faux_bus_root; dev->bus = &faux_bus_type;dev_set_name (dev,"%s" , name);device_set_pm_not_required (dev);drivers/base/faux.c int __init faux_bus_init(void) · line 235
Quoted 2 lines
drivers/base/faux.c +0
-0@@ -236,9 +234,15 @@ int __init faux_bus_init(void) {int ret;Should there be:
Quoted 3 lines
if (faux_bus_root) return -EBUSY;here?
How can that happen?
Quoted 1 line
While I guess there shouldn't be two of these, better be safe.
It can't, no need for that :)
thanks,
greg k-h