Driver core: faux bus
Subsystems (8)
Greg Kroah-Hartman
maintainercover Driver core: faux bus
For years/decades now, I've been complaining when I see people use platform devices for things that are obviously NOT platform devices. To finally fix this up, here is a "faux bus" that should be used instead of a platform device for these tiny and "fake" devices that people create all over the place.
The api is even simpler than the normal platform device api, just two functions, one to create a device and one to remove it. When a device is created, a driver is also created and automatically bound to it, which allows for the probe/release callbacks to work like expected. When finished with the device, just destroy it and all should be good.
This simple api should also hopefully provide for a simple rust binding to it given the simple rules and lifecycle of the pointer passed back from the creation function (i.e. it is alive and valid for as long as you have not called destroy on it.)
I've also converted two different examples of platform device abuse, the dummy regulator driver, and the USB phy code, to use this api. In both cases, the logic either was identical, or became simpler, than before, a good sign (side note, a bug was fixed in the usb phy code that no one ever noticed before).
Greg Kroah-Hartman (3):
driver core: add a faux bus for use when a simple device/bus is needed
regulator: dummy: convert to use the faux bus
USB: phy: convert usb_phy_generic logic to use a faux device
drivers/base/Makefile | 2 +- drivers/base/base.h | 1 + drivers/base/faux.c | 189 ++++++++++++++++++++++++++++ drivers/base/init.c | 1 + drivers/regulator/dummy.c | 37 ++---- drivers/usb/chipidea/ci_hdrc_pci.c | 2 +- drivers/usb/dwc2/pci.c | 4 +- drivers/usb/musb/mediatek.c | 4 +- drivers/usb/musb/mpfs.c | 4 +- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/phy/phy-generic.c | 9 +- include/linux/device/faux.h | 33 +++++ include/linux/usb/usb_phy_generic.h | 9 +- 13 files changed, 251 insertions(+), 46 deletions(-) create mode 100644 drivers/base/faux.c create mode 100644 include/linux/device/faux.h
Signature · 1 line
2.48.1
Greg Kroah-Hartman
maintainerPATCH 1/3 driver core: add a faux bus for use when a simple device/bus is needed
Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead.
--- drivers/base/Makefile | 2 +- drivers/base/base.h | 1 + drivers/base/faux.c | 189 ++++++++++++++++++++++++++++++++++++ drivers/base/init.c | 1 + include/linux/device/faux.h | 33 +++++++ 5 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 drivers/base/faux.c create mode 100644 include/linux/device/faux.h
drivers/base/Makefile +1 -1
@@ -6,7 +6,7 @@ obj-y := component.o core.o bus.o dd.o syscore.o \ cpu.o firmware.o init.o map.o devres.o \ attribute_container.o transport_class.o \ topology.o container.o property.o cacheinfo.o \ - swnode.o + swnode.o faux.o obj-$(CONFIG_AUXILIARY_BUS) += auxiliary.o obj-$(CONFIG_DEVTMPFS) += devtmpfs.o obj-y += power/
drivers/base/base.h +1 -0
@@ -137,6 +137,7 @@ int hypervisor_init(void);static inline int hypervisor_init (void ) {return 0 ; }#endif int platform_bus_init (void ); +int faux_bus_init (void );void cpu_dev_init (void );void container_dev_init (void );#ifdef CONFIG_AUXILIARY_BUS
drivers/base/faux.c new file +189 -0
189 lines not on this page · raw message
drivers/base/init.c +1 -0
@@ -32,6 +32,7 @@ void __init driver_init(void)/* These are also core pieces, but must come after the * core core pieces. */ +faux_bus_init ();of_core_init ();platform_bus_init ();auxiliary_bus_init ();
include/linux/device/faux.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2025 Greg Kroah-Hartman <[email protected]> +* Copyright (c) 2025 The Linux Foundation +* +* A "simple" faux bus that allows devices to be created and added +* automatically to it. Whenever you need a device that is not "real", +* use this interface instead of even thinking of using a platform device. +* +*/ +#ifndef _FAUX_DEVICE_H_ +#define _FAUX_DEVICE_H_ + +#include <linux/module.h> +#include <linux/device.h> + +struct faux_device { +struct device dev; +}; +#define to_faux_device (x) container_of_const((x), struct faux_device, dev) + +struct faux_driver_ops { +int (*probe)(struct faux_device *faux_dev); +void (*remove)(struct faux_device *faux_dev); +}; + +#define faux_device_create (name, faux_ops) __faux_device_create(name, faux_ops, THIS_MODULE) +struct faux_device *__faux_device_create (const char *name, +struct faux_driver_ops *faux_ops, +struct module *module); +void faux_device_destroy (struct faux_device *faux_dev); + +#endif /* _FAUX_DEVICE_H_ */
Signature · 1 line
2.48.1
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 5 lines · Greg Kroah-Hartman
Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead.
...
Quoted 1 line
+#include <
linux/device/faux.h>
I would rather think that this goes after generic inclusions...
drivers/base/faux.c line 15
Quoted 4 lines
drivers/base/faux.c new file +4
-0+#include <linux/err.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/string.h>
...somewhere here.
But looking into organisation of device.h and device/*.h, I would rather think of the linux/faux_device.h.
Quoted 1 line
+#include "
base.h"
I don't remember by heart what it does include, I would go with IWYU principle and list above all what we use.
container_of.hdevice.hexport.hprintk.htypes.h
...
drivers/base/faux.c line 39
Quoted 6 lines
drivers/base/faux.c new file +6
-0+static int faux_match (struct device *dev,const struct device_driver *drv) +{ +struct faux_object *faux_obj =to_faux_object (dev); + +/* Match is simple, strcmp()! */ +return (strcmp (faux_obj->name, drv->name) ==0 );
Outer parentheses are not needed.
Quoted 1 line
+}
...
Quoted 10 lines
+/**
+ *__faux_device_create- create and register a faux device and driver
+ * @name: name of the device and driver we are adding
+ * @faux_ops: structfaux_driver_opsthat the new device will call back into, can be NULL
+ * @owner: module owner of the device/driver
+ *
+ * Create a new faux device and driver, both with the same name, and register
+ * them in the driver core properly. Theprobe()callback of @faux_ops will be
+ * called with the new device that is created for the caller to do something
+ * with.
The kernel-doc will complain on missing Return: section.
drivers/base/faux.c line 108
Quoted 12 lines
+ */
drivers/base/faux.c new file +10
-0+struct faux_device *__faux_device_create (const char *name, +struct faux_driver_ops *faux_ops, +struct module *owner) +{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret; + faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );
Potential overflow. To avoid one may use struct_size() from overflow.h.
Quoted 44 lines
drivers/base/faux.c new file +44
-0+if (!faux_obj) +return NULL ; + +/* Save off the name of the object into local memory */ +strcpy (faux_obj->name, name); + +/* Initialize the driver portion and register it with the driver core */ + faux_obj->faux_ops = faux_ops; + drv = &faux_obj->driver; + + drv->owner = owner; + drv->name = faux_obj->name; + drv->bus = &faux_bus_type; + drv->probe_type =PROBE_PREFER_ASYNCHRONOUS ; + + ret =driver_register (drv); +if (ret) { +pr_err ("%s: driver_register for %s faux driver failed with %d\n" , + __func__, name, ret); +kfree (faux_obj); +return NULL ; + } + +/* Initialize the device portion and register it with the driver core */ + faux_dev = &faux_obj->faux_dev; + dev = &faux_dev->dev; + +device_initialize (dev); + dev->release = faux_device_release; + dev->parent = &faux_bus_root; + dev->bus = &faux_bus_type; +dev_set_name (dev,"%s" , name); + + ret =device_add (dev); +if (ret) { +pr_err ("%s: device_add for %s faux device failed with %d\n" , + __func__, name, ret); +put_device (dev); +return NULL ; + } + +return faux_dev; +} +EXPORT_SYMBOL_GPL (__faux_device_create);
...
include/linux/device/faux.h line 14
Quoted 4 lines
include/linux/device/faux.h new file +3
-0+#ifndef _FAUX_DEVICE_H_ +#define _FAUX_DEVICE_H_ +#include <linux/module.h>
+ container_of.h
Quoted 19 lines
include/linux/device/faux.h new file +18
-0+#include <linux/device.h> +struct faux_device { +struct device dev; +}; +#define to_faux_device (x) container_of_const((x), struct faux_device, dev) + +struct faux_driver_ops { +int (*probe)(struct faux_device *faux_dev); +void (*remove)(struct faux_device *faux_dev); +}; + +#define faux_device_create (name, faux_ops) __faux_device_create(name, faux_ops, THIS_MODULE) +struct faux_device *__faux_device_create (const char *name, +struct faux_driver_ops *faux_ops, +struct module *module); +void faux_device_destroy (struct faux_device *faux_dev); + +#endif /* _FAUX_DEVICE_H_ */
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 1 line · Andy Shevchenko
On Mon, Feb 03, 2025 at 03:25:17PM +0100, Greg Kroah-Hartman wrote:
...
Quoted 9 lines
I don't remember by heart what it does include, I would go with IWYU principle and list above all what we use.
container_of.hdevice.hexport.hprintk.h
types.h
Probably types.h is too much and stddef.h would suffice (as it provides NULL pointer definition).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Greg Kroah-Hartman
maintainerRe: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
In reply to Andy ShevchenkoQuoted 20 lines · Andy Shevchenko
Quoted 5 lines · Greg Kroah-Hartman
Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead.
...
Quoted 1 line
+#include <
linux/device/faux.h>I would rather think that this goes after generic inclusions...
drivers/base/faux.c line 15
Quoted 4 lines
drivers/base/faux.c new file +4
-0+#include <linux/err.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/string.h> ...somewhere here.
Quoted 2 lines
But looking into organisation of
device.hand device/*.h, I would rather think of thelinux/faux_device.h.
It can go anywhere, there is no need to sort things :)
Quoted 10 lines
Quoted 1 line
+#include "
base.h"I don't remember by heart what it does include, I would go with IWYU principle and list above all what we use.
container_of.hdevice.hexport.hprintk.htypes.h
That's not what the driver core ever did, so no need to worry about it, thanks.
Quoted 11 lines
...
drivers/base/faux.c line 39
Quoted 6 lines
drivers/base/faux.c new file +6
-0+static int faux_match (struct device *dev,const struct device_driver *drv) +{ +struct faux_object *faux_obj =to_faux_object (dev); + +/* Match is simple, strcmp()! */ +return (strcmp (faux_obj->name, drv->name) ==0 );Outer parentheses are not needed.
Makes me feel good as it is an assignment test, and that's what platform.c has for the past few decades.
Quoted 11 lines
Quoted 10 lines
+/**
+ *__faux_device_create- create and register a faux device and driver
+ * @name: name of the device and driver we are adding
+ * @faux_ops: structfaux_driver_opsthat the new device will call back into, can be NULL
+ * @owner: module owner of the device/driver
+ *
+ * Create a new faux device and driver, both with the same name, and register
+ * them in the driver core properly. Theprobe()callback of @faux_ops will be
+ * called with the new device that is created for the caller to do something
+ * with.
Quoted 1 line
The kernel-doc will complain on missing Return: section.
Is that new? Does that mean platform.c has lots of complaints in it as well? What does platform_find_device_by_driver() give you for a documentation issue?
And as I didn't hook this up to the kernel documentation build yet, it shouldn't produce any warnings anywhere :)
Quoted 11 lines
Quoted 10 lines
+ */
drivers/base/faux.c new file +9
-0+struct faux_device *__faux_device_create (const char *name, +struct faux_driver_ops *faux_ops, +struct module *owner) +{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret;
Quoted 3 lines
drivers/base/faux.c line 108
Quoted 1 line
drivers/base/faux.c new file +1
-0+ faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.
Users should not be providing the string here. Again, this comes from platform.c.
Quoted 6 lines
include/linux/device/faux.h line 14
Quoted 4 lines
include/linux/device/faux.h new file +3
-0+#ifndef _FAUX_DEVICE_H_ +#define _FAUX_DEVICE_H_ +#include <linux/module.h> +
container_of.h
Not needed to compile this file, only if someone uses the #define in it.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 11 lines · Greg Kroah-Hartman
Quoted 11 lines
Quoted 10 lines
+ */
drivers/base/faux.c new file +9
-0+struct faux_device *__faux_device_create (const char *name, +struct faux_driver_ops *faux_ops, +struct module *owner) +{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret;
Quoted 6 lines
Quoted 3 lines
drivers/base/faux.c line 108
Quoted 1 line
drivers/base/faux.c new file +1
-0+ faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.Users should not be providing the string here. Again, this comes from
platform.c.
Sima just proved me wrong, I'll go check for this now, thanks for pointing it out.
greg k-h
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 16 lines · Greg Kroah-Hartman
Quoted 15 lines · Greg Kroah-Hartman
Quoted 14 lines
drivers/base/faux.c line 108
Quoted 12 lines
+ */
drivers/base/faux.c new file +10
-0+struct faux_device *__faux_device_create (const char *name, +struct faux_driver_ops *faux_ops, +struct module *owner) +{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret; + faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.
Quoted 5 lines
Quoted 2 lines
Users should not be providing the string here. Again, this comes from
platform.c.Sima just proved me wrong, I'll go check for this now, thanks for pointing it out.
Ah, you are welcome!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
In reply to Greg Kroah-HartmanQuoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Andy Shevchenko
On Mon, Feb 03, 2025 at 03:25:17PM +0100, Greg Kroah-Hartman wrote:
...
Quoted 11 lines
Quoted 11 lines
Quoted 1 line
+#include <
linux/device/faux.h>I would rather think that this goes after generic inclusions...
drivers/base/faux.c line 15
Quoted 4 lines
drivers/base/faux.c new file +4
-0+#include <linux/err.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/string.h> ...somewhere here.
Quoted 4 lines
Quoted 2 lines
But looking into organisation of
device.hand device/*.h, I would rather think of thelinux/faux_device.h.It can go anywhere, there is no need to sort things :)
It's not about sorting, it's about grouping from more generic to less generic.
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
+#include "
base.h"I don't remember by heart what it does include, I would go with IWYU principle and list above all what we use.
Quoted 8 lines
Quoted 5 lines
container_of.hdevice.hexport.hprintk.htypes.hThat's not what the driver core ever did, so no need to worry about it, thanks.
But it doesn't mean that driver code does its best. No big worries, of course.
...
Quoted 6 lines
Quoted 3 lines
drivers/base/faux.c line 39
Quoted 1 line
drivers/base/faux.c new file +1
-0+return (strcmp (faux_obj->name, drv->name) ==0 );Outer parentheses are not needed.
Makes me feel good as it is an assignment test, and that's what
platform.chas for the past few decades.
Sure, it also can be written as
return !strcmp(faux_obj->name, drv->name);
that makes the same without explicit comparing to 0. But it's matter of taste.
...
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
+/**
+ *__faux_device_create- create and register a faux device and driver
+ * @name: name of the device and driver we are adding
+ * @faux_ops: structfaux_driver_opsthat the new device will call back into, can be NULL
+ * @owner: module owner of the device/driver
+ *
+ * Create a new faux device and driver, both with the same name, and register
+ * them in the driver core properly. Theprobe()callback of @faux_ops will be
+ * called with the new device that is created for the caller to do something
+ * with.
Quoted 8 lines
Quoted 1 line
The kernel-doc will complain on missing Return: section.
Is that new? Does that mean
platform.chas lots of complaints in it as well? What doesplatform_find_device_by_driver()give you for a documentation issue?And as I didn't hook this up to the kernel documentation build yet, it shouldn't produce any warnings anywhere :)
I would rather say it's old.
Run
kernel-doc -Wall -none -v ...your file...
and find the warning. During the kernel builds this is moved to extra warnings.
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ */
...
Quoted 6 lines
Quoted 3 lines
drivers/base/faux.c line 108
Quoted 1 line
drivers/base/faux.c new file +1
-0+ faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.Users should not be providing the string here. Again, this comes from
platform.c.
I'm not sure I follow. The name parameter is not limited anyhow, so one may provide non-terminated string and strlen() will return an arbitrary number. Potentially this can lead to big numbers and become an overflow when gets to a parameter for kmalloc(). This most likely never happen in real life, but still the overflow is possible.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Andy Shevchenko
On Mon, Feb 03, 2025 at 03:25:17PM +0100, Greg Kroah-Hartman wrote:
...
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
drivers/base/faux.c line 108
Quoted 1 line
drivers/base/faux.c new file +1
-0+ faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.
Quoted 8 lines
Quoted 2 lines
Users should not be providing the string here. Again, this comes from
platform.c.I'm not sure I follow. The name parameter is not limited anyhow, so one may provide non-terminated string and
strlen()will return an arbitrary number. Potentially this can lead to big numbers and become an overflow when gets to a parameter forkmalloc(). This most likely never happen in real life, but still the overflow is possible.
After reading your other messages I got what you are talking about here. Now it's all clear.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Greg Kroah-Hartman
maintainerRe: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
In reply to Andy ShevchenkoQuoted 20 lines · Andy Shevchenko
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
+/**
+ *__faux_device_create- create and register a faux device and driver
+ * @name: name of the device and driver we are adding
+ * @faux_ops: structfaux_driver_opsthat the new device will call back into, can be NULL
+ * @owner: module owner of the device/driver
+ *
+ * Create a new faux device and driver, both with the same name, and register
+ * them in the driver core properly. Theprobe()callback of @faux_ops will be
+ * called with the new device that is created for the caller to do something
+ * with.Quoted 8 lines
Quoted 1 line
The kernel-doc will complain on missing Return: section.
Is that new? Does that mean
platform.chas lots of complaints in it as well? What doesplatform_find_device_by_driver()give you for a documentation issue?And as I didn't hook this up to the kernel documentation build yet, it shouldn't produce any warnings anywhere :)
Quoted 7 lines
I would rather say it's old.
Run
kernel-doc -Wall -none -v ...your file...
and find the warning. During the kernel builds this is moved to extra warnings.
Ah, nice, didn't know about that. Now fixed up.
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ */
...
Quoted 4 lines
Quoted 3 lines
drivers/base/faux.c line 108
Quoted 1 line
drivers/base/faux.c new file +1
-0+ faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.
Quoted 8 lines
Quoted 2 lines
Users should not be providing the string here. Again, this comes from
platform.c.I'm not sure I follow. The name parameter is not limited anyhow, so one may provide non-terminated string and
strlen()will return an arbitrary number. Potentially this can lead to big numbers and become an overflow when gets to a parameter forkmalloc(). This most likely never happen in real life, but still the overflow is possible.
I've now bounded at 256, because really, who needs a bigger name for a device than that :)
thanks,
greg k-h
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 1 line · Greg Kroah-Hartman
On Mon, Feb 03, 2025 at 06:05:19PM +0200, Andy Shevchenko wrote:
...
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
drivers/base/faux.c line 108
Quoted 1 line
drivers/base/faux.c new file +1
-0+ faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL );Potential overflow. To avoid one may use
struct_size()fromoverflow.h.Users should not be providing the string here. Again, this comes from
platform.c.
Quoted 8 lines
Quoted 5 lines
I'm not sure I follow. The name parameter is not limited anyhow, so one may provide non-terminated string and
strlen()will return an arbitrary number. Potentially this can lead to big numbers and become an overflow when gets to a parameter forkmalloc(). This most likely never happen in real life, but still the overflow is possible.I've now bounded at 256, because really, who needs a bigger name for a device than that :)
Works for me! With printable ASCII characters it can be estimated as up to 64^256 combinations, which "ought to be enough for everybody" (of course it will be much less if we count only human-readable strings). :-)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
In reply to Greg Kroah-HartmanQuoted 7 lines · On Mon, 3 Feb 2025 15:25:17 +0100 Greg Kroah-Hartman…
Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead.
Signed-off-by Greg Kroah-Hartman <[email protected]>
Nice. One trivial thing inline.
Quoted 9 lines
drivers/base/faux.c new file +1
-0@@ -0,0 +1,189 @@ +int __init faux_bus_init (void )
drivers/base/faux.c line 184
Quoted 10 lines
drivers/base/faux.c new file +10
-0+{ +int error; + + error =device_register (&faux_bus_root); +if (error) { +put_device (&faux_bus_root); +return error; + } + + error =bus_register (&faux_bus_type);
Odd bonus space after =
Quoted 5 lines
drivers/base/faux.c new file +5
-0+if (error) +device_unregister (&faux_bus_root); + +return error; +}
Greg Kroah-Hartman
maintainerRe: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 22 lines · Jonathan Cameron
Quoted 7 lines · On Mon, 3 Feb 2025 15:25:17 +0100 Greg Kroah-Hartman…
Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead.
Signed-off-by Greg Kroah-Hartman <[email protected]>Nice. One trivial thing inline.
Quoted 6 lines
drivers/base/faux.c new file +0
-0@@ -0,0 +1,189 @@
Quoted 13 lines
drivers/base/faux.c line 184
Quoted 11 lines
drivers/base/faux.c new file +11
-0+int __init faux_bus_init (void ) +{ +int error; + + error =device_register (&faux_bus_root); +if (error) { +put_device (&faux_bus_root); +return error; + } + + error =bus_register (&faux_bus_type);Odd bonus space after =
Thanks! I caught that when I just rewrote this function, and I finally got around to running checkpatch which found another error in it that I missed. It's sometimes easier to notice changes in other's code than your own :)
greg k-h
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
In reply to Greg Kroah-HartmanQuoted 16 lines · Greg Kroah-Hartman
Many drivers abuse the platform driver/bus system as it provides a simple way to create and bind a device to a driver-specific set of probe/release functions. Instead of doing that, and wasting all of the memory associated with a platform device, here is a "faux" bus that can be used instead.
Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/base/Makefile | 2 +- drivers/base/base.h | 1 + drivers/base/faux.c | 189 ++++++++++++++++++++++++++++++++++++ drivers/base/init.c | 1 + include/linux/device/faux.h | 33 +++++++ 5 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 drivers/base/faux.c create mode 100644 include/linux/device/faux.h
<snip>
Quoted 62 lines
drivers/base/faux.c new file +56
-0@@ -0,0 +1,189 @@ +// SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2025 Greg Kroah-Hartman <[email protected]> +* Copyright (c) 2025 The Linux Foundation +* +* A "simple" faux bus that allows devices to be created and added +* automatically to it. Whenever you need a device that is not "real", +* use this interface instead of even thinking of using a platform device. +* +*/ +#include <linux/device/faux.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/string.h> +#include "base.h" + +/* +* Internal wrapper structure so we can hold the memory +* for the driver and the name string of the faux device. +*/ +struct faux_object { +struct faux_device faux_dev; +struct device_driver driver; +const struct faux_driver_ops *faux_ops; +char name[]; +}; +#define to_faux_object (x) container_of_const(dev, struct faux_object, faux_dev.dev); + +static struct device faux_bus_root = { + .init_name ="faux_bus" , +}; + +static int faux_match (struct device *dev,const struct device_driver *drv) +{ +struct faux_object *faux_obj =to_faux_object (dev); + +/* Match is simple, strcmp()! */ +return (strcmp (faux_obj->name, drv->name) ==0 ); +} + +static int faux_probe (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct faux_device *faux_dev = &faux_obj->faux_dev; +const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; +int ret =0 ; + +if (faux_ops && faux_ops->probe) + ret = faux_ops->probe (faux_dev); + +return ret; +} + +static void faux_remove (struct device *dev) +{
drivers/base/faux.c line 66
Quoted 10 lines
drivers/base/faux.c new file +10
-0+struct faux_object *faux_obj =to_faux_object (dev); +struct faux_device *faux_dev = &faux_obj->faux_dev; +const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; + +if (faux_ops && faux_ops->remove) + faux_ops->remove (faux_dev); +} + +static const struct bus_type faux_bus_type = { + .name ="faux_bus" ,
Is the _bus suffix intentional?
Other busses don't have it.
Quoted 23 lines
drivers/base/faux.c new file +23
-0+ .match = faux_match, + .probe = faux_probe, + .remove = faux_remove, +}; + +static void faux_device_release (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct device_driver *drv = &faux_obj->driver; + +/* +* Now that the device is going away, it has been unbound from the +* driver we created for it, so it is safe to unregister the driver from +* the system. +*/ +driver_unregister (drv); + +kfree (faux_obj); +} + +/** +* __faux_device_create - create and register a faux device and driver +* @name: name of the device and driver we are adding
drivers/base/faux.c line 99
Quoted 10 lines
drivers/base/faux.c new file +10
-0+* @faux_ops: struct faux_driver_ops that the new device will call back into, can be NULL +* @owner: module owner of the device/driver +* +* Create a new faux device and driver, both with the same name, and register +* them in the driver core properly. The probe() callback of @faux_ops will be +* called with the new device that is created for the caller to do something +* with. +*/ +struct faux_device *__faux_device_create(const char *name, + struct faux_driver_ops *faux_ops,
const
drivers/base/faux.c line 100
Quoted 1 line
drivers/base/faux.c new file +1
-0+ struct module *owner)
What about attributes?
Quoted 10 lines
drivers/base/faux.c new file +10
-0+{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret; + + faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL ); +if (!faux_obj) +return NULL ;
drivers/base/faux.c line 120
Quoted 10 lines
drivers/base/faux.c new file +10
-0+ +/* Save off the name of the object into local memory */ +strcpy (faux_obj->name, name); + +/* Initialize the driver portion and register it with the driver core */ + faux_obj->faux_ops = faux_ops; + drv = &faux_obj->driver; + + drv->owner = owner; + drv->name = faux_obj->name;
Assuming most names are constant, this would be better with kstrdup_const(). Which is also used by dev_set_name() under the hood.
Quoted 32 lines
drivers/base/faux.c new file +32
-0+ drv->bus = &faux_bus_type; + drv->probe_type =PROBE_PREFER_ASYNCHRONOUS ; + + ret =driver_register (drv); +if (ret) { +pr_err ("%s: driver_register for %s faux driver failed with %d\n" , + __func__, name, ret); +kfree (faux_obj); +return NULL ; + } + +/* Initialize the device portion and register it with the driver core */ + faux_dev = &faux_obj->faux_dev; + dev = &faux_dev->dev; + +device_initialize (dev); + dev->release = faux_device_release; + dev->parent = &faux_bus_root; + dev->bus = &faux_bus_type; +dev_set_name (dev,"%s" , name); + + ret =device_add (dev); +if (ret) { +pr_err ("%s: device_add for %s faux device failed with %d\n" , + __func__, name, ret); +put_device (dev); +return NULL ; + } + +return faux_dev; +} +EXPORT_SYMBOL_GPL (__faux_device_create);
<snip>
Greg Kroah-Hartman
maintainerRe: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 15 lines · Thomas Weißschuh
drivers/base/faux.c line 66
Quoted 12 lines · Greg Kroah-Hartman
drivers/base/faux.c new file +12
-0+static void faux_remove (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct faux_device *faux_dev = &faux_obj->faux_dev; +const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; + +if (faux_ops && faux_ops->remove) + faux_ops->remove (faux_dev); +} + +static const struct bus_type faux_bus_type = { + .name ="faux_bus" ,Is the
_bussuffix intentional?
It was intentional.
Quoted 1 line
Other busses don't have it.
True. Naming is hard. I guess /sys/bus/faux/ makes sense, I will go rename it.
But for the "root" device, does /sys/devices/faux_bus/ make sense, or should it be /sys/devices/faux/ as well? I'm now leaning toward the latter...
Quoted 36 lines
Quoted 23 lines
drivers/base/faux.c new file +23
-0+ .match = faux_match, + .probe = faux_probe, + .remove = faux_remove, +}; + +static void faux_device_release (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct device_driver *drv = &faux_obj->driver; + +/* +* Now that the device is going away, it has been unbound from the +* driver we created for it, so it is safe to unregister the driver from +* the system. +*/ +driver_unregister (drv); + +kfree (faux_obj); +} + +/** +* __faux_device_create - create and register a faux device and driver +* @name: name of the device and driver we are adding drivers/base/faux.c line 99
Quoted 10 lines
drivers/base/faux.c new file +10
-0+* @faux_ops: struct faux_driver_ops that the new device will call back into, can be NULL +* @owner: module owner of the device/driver +* +* Create a new faux device and driver, both with the same name, and register +* them in the driver core properly. The probe() callback of @faux_ops will be +* called with the new device that is created for the caller to do something +* with. +*/ +struct faux_device *__faux_device_create(const char *name, + struct faux_driver_ops *faux_ops,const
Quoted 3 lines
drivers/base/faux.c line 100
Quoted 1 line
drivers/base/faux.c new file +1
-0+ struct module *owner)What about attributes?
What in-kernel user of this wants an attribute for such a device?
And again, if we find one, we can make a faux_device_create_groups() call that takes a pointer to an attribute group structure if it's really needed.
Quoted 16 lines
Quoted 16 lines
drivers/base/faux.c new file +15
-0+{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret; + + faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL ); +if (!faux_obj) +return NULL ; + +/* Save off the name of the object into local memory */ +strcpy (faux_obj->name, name); + +/* Initialize the driver portion and register it with the driver core */
Quoted 8 lines
drivers/base/faux.c line 120
Quoted 5 lines
drivers/base/faux.c new file +5
-0+ faux_obj->faux_ops = faux_ops; + drv = &faux_obj->driver; + + drv->owner = owner; + drv->name = faux_obj->name;Assuming most names are constant, this would be better with
kstrdup_const(). Which is also used bydev_set_name()under the hood.
I've now removed the additional driver, but note that this is just a pointer assignment, which is fine to do here as the lifespan of faux_obj->name outlived the driver structure's lifespan.
thanks for the review, much appreciated!
greg k-h
Re: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 19 lines · Greg Kroah-Hartman
Quoted 15 lines · Thomas Weißschuh
drivers/base/faux.c line 66
Quoted 12 lines · Greg Kroah-Hartman
drivers/base/faux.c new file +12
-0+static void faux_remove (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct faux_device *faux_dev = &faux_obj->faux_dev; +const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; + +if (faux_ops && faux_ops->remove) + faux_ops->remove (faux_dev); +} + +static const struct bus_type faux_bus_type = { + .name ="faux_bus" ,Is the
_bussuffix intentional?It was intentional.
Quoted 8 lines
Quoted 1 line
Other busses don't have it.
True. Naming is hard. I guess
/sys/bus/faux/makes sense, I will go rename it.But for the "root" device, does
/sys/devices/faux_bus/make sense, or should it be/sys/devices/faux/as well? I'm now leaning toward the latter...
I'm leaning slightly towards the former.
But my naming skills are beyond limited.
Quoted 36 lines
Quoted 36 lines
Quoted 23 lines
drivers/base/faux.c new file +23
-0+ .match = faux_match, + .probe = faux_probe, + .remove = faux_remove, +}; + +static void faux_device_release (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct device_driver *drv = &faux_obj->driver; + +/* +* Now that the device is going away, it has been unbound from the +* driver we created for it, so it is safe to unregister the driver from +* the system. +*/ +driver_unregister (drv); + +kfree (faux_obj); +} + +/** +* __faux_device_create - create and register a faux device and driver +* @name: name of the device and driver we are adding drivers/base/faux.c line 99
Quoted 10 lines
drivers/base/faux.c new file +10
-0+* @faux_ops: struct faux_driver_ops that the new device will call back into, can be NULL +* @owner: module owner of the device/driver +* +* Create a new faux device and driver, both with the same name, and register +* them in the driver core properly. The probe() callback of @faux_ops will be +* called with the new device that is created for the caller to do something +* with. +*/ +struct faux_device *__faux_device_create(const char *name, + struct faux_driver_ops *faux_ops,const
Quoted 5 lines
Quoted 3 lines
drivers/base/faux.c line 100
Quoted 1 line
drivers/base/faux.c new file +1
-0+ struct module *owner)What about attributes?
What in-kernel user of this wants an attribute for such a device?
It was mostly a guess.
However drivers/video/fbdev/gbefb.c seems to be an example.
Quoted 3 lines
And again, if we find one, we can make a
faux_device_create_groups()call that takes a pointer to an attribute group structure if it's really needed.
Fair enough.
Quoted 24 lines
Quoted 15 lines
Quoted 15 lines
drivers/base/faux.c new file +15
-0+{ +struct device_driver *drv; +struct device *dev; +struct faux_object *faux_obj; +struct faux_device *faux_dev; +int ret; + + faux_obj =kzalloc (sizeof (*faux_obj) +strlen (name) +1 ,GFP_KERNEL ); +if (!faux_obj) +return NULL ; + +/* Save off the name of the object into local memory */ +strcpy (faux_obj->name, name); + +/* Initialize the driver portion and register it with the driver core */ Quoted 8 lines
drivers/base/faux.c line 120
Quoted 5 lines
drivers/base/faux.c new file +5
-0+ faux_obj->faux_ops = faux_ops; + drv = &faux_obj->driver; + + drv->owner = owner; + drv->name = faux_obj->name;Assuming most names are constant, this would be better with
kstrdup_const(). Which is also used bydev_set_name()under the hood.
Quoted 3 lines
I've now removed the additional driver, but note that this is just a pointer assignment, which is fine to do here as the lifespan of
faux_obj->nameoutlived the driver structure's lifespan.
It outlives it because there is extra space allocated for it in faux_obj. With kstrdup_const() that space would not be needed.
In the end it shouldn't really matter one way or another.
Thomas
Greg Kroah-Hartman
maintainerRe: [PATCH 1/3] driver core: add a faux bus for use when a simple device/bus is needed
Quoted 68 lines · Thomas Weißschuh
Quoted 19 lines · Greg Kroah-Hartman
Quoted 15 lines · Thomas Weißschuh
drivers/base/faux.c line 66
Quoted 12 lines · Greg Kroah-Hartman
drivers/base/faux.c new file +12
-0+static void faux_remove (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct faux_device *faux_dev = &faux_obj->faux_dev; +const struct faux_driver_ops *faux_ops = faux_obj->faux_ops; + +if (faux_ops && faux_ops->remove) + faux_ops->remove (faux_dev); +} + +static const struct bus_type faux_bus_type = { + .name ="faux_bus" ,Is the
_bussuffix intentional?It was intentional.
Quoted 8 lines
Quoted 1 line
Other busses don't have it.
True. Naming is hard. I guess
/sys/bus/faux/makes sense, I will go rename it.But for the "root" device, does
/sys/devices/faux_bus/make sense, or should it be/sys/devices/faux/as well? I'm now leaning toward the latter...I'm leaning slightly towards the former.
But my naming skills are beyond limited.Quoted 36 lines
Quoted 36 lines
Quoted 23 lines
drivers/base/faux.c new file +23
-0+ .match = faux_match, + .probe = faux_probe, + .remove = faux_remove, +}; + +static void faux_device_release (struct device *dev) +{ +struct faux_object *faux_obj =to_faux_object (dev); +struct device_driver *drv = &faux_obj->driver; + +/* +* Now that the device is going away, it has been unbound from the +* driver we created for it, so it is safe to unregister the driver from +* the system. +*/ +driver_unregister (drv); + +kfree (faux_obj); +} + +/** +* __faux_device_create - create and register a faux device and driver +* @name: name of the device and driver we are adding drivers/base/faux.c line 99
Quoted 10 lines
drivers/base/faux.c new file +10
-0+* @faux_ops: struct faux_driver_ops that the new device will call back into, can be NULL +* @owner: module owner of the device/driver +* +* Create a new faux device and driver, both with the same name, and register +* them in the driver core properly. The probe() callback of @faux_ops will be +* called with the new device that is created for the caller to do something +* with. +*/ +struct faux_device *__faux_device_create(const char *name, + struct faux_driver_ops *faux_ops,const
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
drivers/base/faux.c line 100
Quoted 1 line
drivers/base/faux.c new file +1
-0+ struct module *owner)What about attributes?
What in-kernel user of this wants an attribute for such a device?
It was mostly a guess.
Howeverdrivers/video/fbdev/gbefb.cseems to be an example.
As that driver is allocateing io memory and the like, it really looks like a "real" platform driver/device to me. Do you think it should not be one?
Also, that driver should be converted to use an attribute group instead of manually adding those sysfs files, if you wanted to touch it in the future :)
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 2/3 regulator: dummy: convert to use the faux bus
In reply to Greg Kroah-HartmanThe dummy regulator driver does not need to create a platform device, it only did so because it was simple to do. Change it over to use the faux bus instead as this is NOT a real platform device, and it makes the code even smaller than before.
--- drivers/regulator/dummy.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-)
drivers/regulator/dummy.c +9 -28
@@ -13,7 +13,7 @@#include <linux/err.h> #include <linux/export.h> -#include <linux/platform_device.h> +#include <linux/device/faux.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h>
@@ -37,15 +37,15 @@ static const struct regulator_desc dummy_desc = { .ops = &dummy_ops, }; -static int dummy_regulator_probe (struct platform_device *pdev) +static int dummy_regulator_probe (struct faux_device *vdev) {struct regulator_config config = { };int ret; - config.dev = &pdev->dev; + config.dev = &vdev->dev; config.init_data = &dummy_initdata; - dummy_regulator_rdev =devm_regulator_register (&pdev->dev, &dummy_desc, + dummy_regulator_rdev =devm_regulator_register (&vdev->dev, &dummy_desc, &config);if (IS_ERR (dummy_regulator_rdev)) { ret =PTR_ERR (dummy_regulator_rdev);
@@ -56,36 +56,17 @@ static int dummy_regulator_probe(struct platform_device *pdev)return 0 ; } -static struct platform_driver dummy_regulator_driver = { - .probe = dummy_regulator_probe, - .driver = { - .name ="reg-dummy" , - .probe_type =PROBE_PREFER_ASYNCHRONOUS , - }, +struct faux_driver_ops dummy_regulator_driver = { + .probe = dummy_regulator_probe, }; -static struct platform_device *dummy_pdev; +static struct faux_device *dummy_fdev;void __init regulator_dummy_init (void ) { -int ret; - - dummy_pdev =platform_device_alloc ("reg-dummy" ,-1 ); -if (!dummy_pdev) { + dummy_fdev =faux_device_create ("reg-dummy" , &dummy_regulator_driver); +if (!dummy_fdev) {pr_err ("Failed to allocate dummy regulator device\n" );return ; } - - ret =platform_device_add (dummy_pdev); -if (ret !=0 ) { -pr_err ("Failed to register dummy regulator device: %d\n" , ret); -platform_device_put (dummy_pdev); -return ; - } - - ret =platform_driver_register (&dummy_regulator_driver); -if (ret !=0 ) { -pr_err ("Failed to register dummy regulator driver: %d\n" , ret); -platform_device_unregister (dummy_pdev); - } }
Signature · 1 line
2.48.1
Mark Brown
maintainerRe: [PATCH 2/3] regulator: dummy: convert to use the faux bus
Quoted 4 lines · Greg Kroah-Hartman
The dummy regulator driver does not need to create a platform device, it only did so because it was simple to do. Change it over to use the faux bus instead as this is NOT a real platform device, and it makes the code even smaller than before.
No, they did this because you explicitly asked that this be done....
drivers/regulator/dummy.c static const struct regulator_desc dummy_desc = { · line 40
Quoted 2 lines
drivers/regulator/dummy.c +1
-1-static int dummy_regulator_probe (struct platform_device *pdev) +static int dummy_regulator_probe (struct faux_device *vdev)
Just dev or fdev - we could just pass a struct device in here, we don't actually care that it's a platform device at this point. Having the abbreviation mismatch with the device type is odd.
Greg Kroah-Hartman
maintainerRe: [PATCH 2/3] regulator: dummy: convert to use the faux bus
Quoted 7 lines · Mark Brown
Quoted 4 lines · Greg Kroah-Hartman
The dummy regulator driver does not need to create a platform device, it only did so because it was simple to do. Change it over to use the faux bus instead as this is NOT a real platform device, and it makes the code even smaller than before.
No, they did this because you explicitly asked that this be done....
I did? What was it attempting to be before this? I don't remember that at all, sorry.
Quoted 6 lines
drivers/regulator/dummy.c static const struct regulator_desc dummy_desc = { · line 40
Quoted 2 lines
drivers/regulator/dummy.c +1
-1-static int dummy_regulator_probe (struct platform_device *pdev) +static int dummy_regulator_probe (struct faux_device *vdev)Just dev or fdev - we could just pass a struct device in here, we don't actually care that it's a platform device at this point. Having the abbreviation mismatch with the device type is odd.
Ah, that's a mistake from my first pass when this was a "struct virtual_device" and I called this "vdev". I'll go fix that up, thanks.
greg k-h
Mark Brown
maintainerRe: [PATCH 2/3] regulator: dummy: convert to use the faux bus
Quoted 8 lines · Greg Kroah-Hartman
Quoted 6 lines · Mark Brown
Quoted 4 lines · Greg Kroah-Hartman
The dummy regulator driver does not need to create a platform device, it only did so because it was simple to do. Change it over to use the faux bus instead as this is NOT a real platform device, and it makes the code even smaller than before.
Quoted 4 lines
Quoted 1 line
No, they did this because you explicitly asked that this be done....
I did? What was it attempting to be before this? I don't remember that at all, sorry.
Yeah, there were some things where people were creating custom buses for internal uses like this which you pushed back on due to code duplication
- you said to just use platform bus since the bus code looked identical.
Greg Kroah-Hartman
maintainerPATCH 3/3 USB: phy: convert usb_phy_generic logic to use a faux device
In reply to Greg Kroah-HartmanThe usb_phy_generic code was creating a "fake" platform device to pass around in different places. Instead of doing that, use the faux bus instead as that is what is really wanted here.
Site note, this fixes a bug in the mpfs driver where the incorrect pointer was being passed to usb_phy_generic_unregister(), odd that no one ever hit this in the past.
--- drivers/usb/chipidea/ci_hdrc_pci.c | 2 +- drivers/usb/dwc2/pci.c | 4 ++-- drivers/usb/musb/mediatek.c | 4 ++-- drivers/usb/musb/mpfs.c | 4 ++-- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/phy/phy-generic.c | 9 ++++----- include/linux/usb/usb_phy_generic.h | 9 +++++---- 7 files changed, 17 insertions(+), 17 deletions(-)
drivers/usb/chipidea/ci_hdrc_pci.c +1 -1
@@ -20,7 +20,7 @@struct ci_hdrc_pci {struct platform_device *ci; -struct platform_device *phy; +struct faux_device *phy; };/******************************************************************************
drivers/usb/dwc2/pci.c +2 -2
@@ -30,7 +30,7 @@ static const char dwc2_driver_name[] = "dwc2-pci";struct dwc2_pci_glue {struct platform_device *dwc2; -struct platform_device *phy; +struct faux_device *phy; };/**
@@ -53,7 +53,7 @@ static int dwc2_pci_probe(struct pci_dev *pci, {struct resource res[2 ];struct platform_device *dwc2; -struct platform_device *phy; +struct faux_device *phy;int ret;struct device *dev = &pci->dev;struct dwc2_pci_glue *glue;
drivers/usb/musb/mediatek.c +2 -2
@@ -43,7 +43,7 @@ struct mtk_glue {struct device *dev;struct musb *musb;struct platform_device *musb_pdev; -struct platform_device *usb_phy; +struct faux_device *usb_phy;struct phy *phy;struct usb_phy *xceiv;enum phy_mode phy_mode;
@@ -507,7 +507,7 @@ static int mtk_musb_probe(struct platform_device *pdev)static void mtk_musb_remove (struct platform_device *pdev) {struct mtk_glue *glue =platform_get_drvdata (pdev); -struct platform_device *usb_phy = glue->usb_phy; +struct faux_device *usb_phy = glue->usb_phy;platform_device_unregister (glue->musb_pdev);usb_phy_generic_unregister (usb_phy);
drivers/usb/musb/mpfs.c +2 -2
@@ -25,7 +25,7 @@struct mpfs_glue {struct device *dev;struct platform_device *musb; -struct platform_device *phy; +struct faux_device *phy;struct clk *clk; };
@@ -356,7 +356,7 @@ static void mpfs_remove(struct platform_device *pdev)clk_disable_unprepare (glue->clk);platform_device_unregister (glue->musb); -usb_phy_generic_unregister (pdev); +usb_phy_generic_unregister (glue->phy); }#ifdef CONFIG_OF
drivers/usb/musb/tusb6010.c +1 -1
@@ -32,7 +32,7 @@struct tusb6010_glue {struct device *dev;struct platform_device *musb; -struct platform_device *phy; +struct faux_device *phy;struct gpio_desc *enable;struct gpio_desc *intpin; };
drivers/usb/phy/phy-generic.c +4 -5
@@ -30,16 +30,15 @@ (IRQF_SHARED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING | \ IRQF_ONESHOT) -struct platform_device *usb_phy_generic_register (void ) +struct faux_device *usb_phy_generic_register (void ) { -return platform_device_register_simple ("usb_phy_generic" , -PLATFORM_DEVID_AUTO ,NULL ,0 ); +return faux_device_create ("usb_phy_generic" ,NULL ); }EXPORT_SYMBOL_GPL (usb_phy_generic_register); -void usb_phy_generic_unregister (struct platform_device *pdev) +void usb_phy_generic_unregister (struct faux_device *fdev) { -platform_device_unregister (pdev); +faux_device_destroy (fdev); }EXPORT_SYMBOL_GPL (usb_phy_generic_unregister);
include/linux/usb/usb_phy_generic.h +5 -4
@@ -3,18 +3,19 @@#define __LINUX_USB_NOP_XCEIV_H#include <linux/usb/otg.h> +#include <linux/device/faux.h> #if IS_ENABLED (CONFIG_NOP_USB_XCEIV )/* sometimes transceivers are accessed only through e.g. ULPI */ -extern struct platform_device *usb_phy_generic_register (void ); -extern void usb_phy_generic_unregister (struct platform_device *); +struct faux_device *usb_phy_generic_register (void ); +void usb_phy_generic_unregister (struct faux_device *);#else -static inline struct platform_device *usb_phy_generic_register (void ) +static inline struct faux_device *usb_phy_generic_register (void ) {return NULL ; } -static inline void usb_phy_generic_unregister (struct platform_device *pdev) +static inline void usb_phy_generic_unregister (struct faux_device *fdev) { }#endif
Signature · 1 line
2.48.1
Re: [PATCH 3/3] USB: phy: convert usb_phy_generic logic to use a faux device
Quoted 7 lines · Greg Kroah-Hartman
The
usb_phy_genericcode was creating a "fake" platform device to pass around in different places. Instead of doing that, use the faux bus instead as that is what is really wanted here.Site note, this fixes a bug in the mpfs driver where the incorrect pointer was being passed to
usb_phy_generic_unregister(), odd that no one ever hit this in the past.
Seems nobody ever removed (unbind'ed) the module at run-time.
Signature · 2 lines
With Best Regards, Andy Shevchenko