| Message ID | 20220413192203.46704-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] iio: dac: ltc2632: Make use of device properties | expand |
On Wed, 13 Apr 2022 22:22:03 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Convert the module to be property provider agnostic and allow > it to be used on non-OF platforms. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Hi Andy, Not sure why I was sitting on this one. Anyhow, now applied to the togreg branch of iio.git and pushed out as testing for all the normal reasons. Thanks, Jonathan > --- > drivers/iio/dac/ltc2632.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c > index aed46c80757e..c0255f402056 100644 > --- a/drivers/iio/dac/ltc2632.c > +++ b/drivers/iio/dac/ltc2632.c > @@ -10,6 +10,7 @@ > #include <linux/spi/spi.h> > #include <linux/module.h> > #include <linux/iio/iio.h> > +#include <linux/property.h> > #include <linux/regulator/consumer.h> > > #include <asm/unaligned.h> > @@ -362,8 +363,7 @@ static int ltc2632_probe(struct spi_device *spi) > } > } > > - indio_dev->name = dev_of_node(&spi->dev) ? dev_of_node(&spi->dev)->name > - : spi_get_device_id(spi)->name; > + indio_dev->name = fwnode_get_name(dev_fwnode(&spi->dev)) ?: spi_get_device_id(spi)->name; > indio_dev->info = <c2632_info; > indio_dev->modes = INDIO_DIRECT_MODE; > indio_dev->channels = chip_info->channels; > @@ -469,7 +469,7 @@ MODULE_DEVICE_TABLE(of, ltc2632_of_match); > static struct spi_driver ltc2632_driver = { > .driver = { > .name = "ltc2632", > - .of_match_table = of_match_ptr(ltc2632_of_match), > + .of_match_table = ltc2632_of_match, > }, > .probe = ltc2632_probe, > .remove = ltc2632_remove,
diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c index aed46c80757e..c0255f402056 100644 --- a/drivers/iio/dac/ltc2632.c +++ b/drivers/iio/dac/ltc2632.c @@ -10,6 +10,7 @@ #include <linux/spi/spi.h> #include <linux/module.h> #include <linux/iio/iio.h> +#include <linux/property.h> #include <linux/regulator/consumer.h> #include <asm/unaligned.h> @@ -362,8 +363,7 @@ static int ltc2632_probe(struct spi_device *spi) } } - indio_dev->name = dev_of_node(&spi->dev) ? dev_of_node(&spi->dev)->name - : spi_get_device_id(spi)->name; + indio_dev->name = fwnode_get_name(dev_fwnode(&spi->dev)) ?: spi_get_device_id(spi)->name; indio_dev->info = <c2632_info; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = chip_info->channels; @@ -469,7 +469,7 @@ MODULE_DEVICE_TABLE(of, ltc2632_of_match); static struct spi_driver ltc2632_driver = { .driver = { .name = "ltc2632", - .of_match_table = of_match_ptr(ltc2632_of_match), + .of_match_table = ltc2632_of_match, }, .probe = ltc2632_probe, .remove = ltc2632_remove,
Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/dac/ltc2632.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)