| Message ID | 20220826173700.17395-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/1] hwmon: (iio_hwmon) Make use of device properties | expand |
On Fri, Aug 26, 2022 at 08:37:00PM +0300, Andy Shevchenko wrote: > Convert the module to be property provider agnostic and allow > it to be used on non-OF platforms. > > Include mod_devicetable.h explicitly to replace the dropped of.h > which included mod_devicetable.h indirectly. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied to hwmon-next. Thanks, Guenter > --- > v2: amended commit message (Guenter) > drivers/hwmon/iio_hwmon.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c > index 580a7d125b88..3aa40893fc09 100644 > --- a/drivers/hwmon/iio_hwmon.c > +++ b/drivers/hwmon/iio_hwmon.c > @@ -6,11 +6,13 @@ > > #include <linux/kernel.h> > #include <linux/slab.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/err.h> > #include <linux/platform_device.h> > +#include <linux/property.h> > + > #include <linux/hwmon.h> > -#include <linux/of.h> > #include <linux/hwmon-sysfs.h> > #include <linux/iio/consumer.h> > #include <linux/iio/types.h> > @@ -149,8 +151,8 @@ static int iio_hwmon_probe(struct platform_device *pdev) > st->attr_group.attrs = st->attrs; > st->groups[0] = &st->attr_group; > > - if (dev->of_node) { > - sname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node); > + if (dev_fwnode(dev)) { > + sname = devm_kasprintf(dev, GFP_KERNEL, "%pfwP", dev_fwnode(dev)); > if (!sname) > return -ENOMEM; > strreplace(sname, '-', '_');
diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c index 580a7d125b88..3aa40893fc09 100644 --- a/drivers/hwmon/iio_hwmon.c +++ b/drivers/hwmon/iio_hwmon.c @@ -6,11 +6,13 @@ #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/err.h> #include <linux/platform_device.h> +#include <linux/property.h> + #include <linux/hwmon.h> -#include <linux/of.h> #include <linux/hwmon-sysfs.h> #include <linux/iio/consumer.h> #include <linux/iio/types.h> @@ -149,8 +151,8 @@ static int iio_hwmon_probe(struct platform_device *pdev) st->attr_group.attrs = st->attrs; st->groups[0] = &st->attr_group; - if (dev->of_node) { - sname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node); + if (dev_fwnode(dev)) { + sname = devm_kasprintf(dev, GFP_KERNEL, "%pfwP", dev_fwnode(dev)); if (!sname) return -ENOMEM; strreplace(sname, '-', '_');
Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Include mod_devicetable.h explicitly to replace the dropped of.h which included mod_devicetable.h indirectly. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: amended commit message (Guenter) drivers/hwmon/iio_hwmon.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)