| Message ID | 20220221220743.541704-2-caleb.connolly@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v8,1/9] spmi: add a helper to look up an SPMI device from a device node | expand |
On Mon, 21 Feb 2022 22:07:35 +0000 Caleb Connolly <caleb.connolly@linaro.org> wrote: > The helper function spmi_device_from_of() takes a device node and > returns the SPMI device associated with it. > This is like of_find_device_by_node but for SPMI devices. > > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> Hi I'm assuming this series will end up going in through my IIO tree. So with that in mind, looking for an Ack from Stephen for this one. One comment below. Also, I vaguely wondered about whether this should switch to generic struct fwnode rather than of/dt specific but that's probably a question for Stephen. Thanks, Jonathan > --- > drivers/spmi/spmi.c | 17 +++++++++++++++++ > include/linux/spmi.h | 2 ++ > 2 files changed, 19 insertions(+) > > diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c > index b37ead9e2fad..de550b777451 100644 > --- a/drivers/spmi/spmi.c > +++ b/drivers/spmi/spmi.c > @@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { > .uevent = spmi_drv_uevent, > }; > > +/** > + * spmi_device_from_of() - get the associated SPMI device from a device node > + * > + * @np: device node > + * > + * Returns the struct spmi_device associated with a device node or NULL. > + */ > +inline struct spmi_device *spmi_device_from_of(struct device_node *np) Drop the inline. You are exporting it which would make inline rather hard to do and in general inline markings should be used only where there is a clear performance argument and there isn't one here. > +{ > + struct device *dev = bus_find_device_by_of_node(&spmi_bus_type, np); > + > + if (dev) > + return to_spmi_device(dev); > + return NULL; > +} > +EXPORT_SYMBOL_GPL(spmi_device_from_of); > + > /** > * spmi_controller_alloc() - Allocate a new SPMI device > * @ctrl: associated controller > diff --git a/include/linux/spmi.h b/include/linux/spmi.h > index 729bcbf9f5ad..6ee476bc1cd6 100644 > --- a/include/linux/spmi.h > +++ b/include/linux/spmi.h > @@ -7,6 +7,7 @@ > #include <linux/types.h> > #include <linux/device.h> > #include <linux/mod_devicetable.h> > +#include <linux/of.h> > > /* Maximum slave identifier */ > #define SPMI_MAX_SLAVE_ID 16 > @@ -164,6 +165,7 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv) > module_driver(__spmi_driver, spmi_driver_register, \ > spmi_driver_unregister) > > +inline struct spmi_device *spmi_device_from_of(struct device_node *np); > int spmi_register_read(struct spmi_device *sdev, u8 addr, u8 *buf); > int spmi_ext_register_read(struct spmi_device *sdev, u8 addr, u8 *buf, > size_t len);
diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index b37ead9e2fad..de550b777451 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { .uevent = spmi_drv_uevent, }; +/** + * spmi_device_from_of() - get the associated SPMI device from a device node + * + * @np: device node + * + * Returns the struct spmi_device associated with a device node or NULL. + */ +inline struct spmi_device *spmi_device_from_of(struct device_node *np) +{ + struct device *dev = bus_find_device_by_of_node(&spmi_bus_type, np); + + if (dev) + return to_spmi_device(dev); + return NULL; +} +EXPORT_SYMBOL_GPL(spmi_device_from_of); + /** * spmi_controller_alloc() - Allocate a new SPMI device * @ctrl: associated controller diff --git a/include/linux/spmi.h b/include/linux/spmi.h index 729bcbf9f5ad..6ee476bc1cd6 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h @@ -7,6 +7,7 @@ #include <linux/types.h> #include <linux/device.h> #include <linux/mod_devicetable.h> +#include <linux/of.h> /* Maximum slave identifier */ #define SPMI_MAX_SLAVE_ID 16 @@ -164,6 +165,7 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv) module_driver(__spmi_driver, spmi_driver_register, \ spmi_driver_unregister) +inline struct spmi_device *spmi_device_from_of(struct device_node *np); int spmi_register_read(struct spmi_device *sdev, u8 addr, u8 *buf); int spmi_ext_register_read(struct spmi_device *sdev, u8 addr, u8 *buf, size_t len);
The helper function spmi_device_from_of() takes a device node and returns the SPMI device associated with it. This is like of_find_device_by_node but for SPMI devices. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> --- drivers/spmi/spmi.c | 17 +++++++++++++++++ include/linux/spmi.h | 2 ++ 2 files changed, 19 insertions(+)