| Message ID | 20220831141530.80572-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/3] iio: magnetometer: yamaha-yas530: Use pointers as driver data | expand |
On Wed, 31 Aug 2022 17:15:28 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Unify ID tables to use pointers for driver data. It will allow > to simplify the driver later on. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Series applied to the togreg branch of iio.git and pushed out as testing for 0-day to see if it can find things we missed. Still time for feedback from others before I push this out as the more or less non-rebasing, togreg branch. Thanks, Jonathan > --- > v2: left ID fallback in place (Jonathan) > drivers/iio/magnetometer/yamaha-yas530.c | 23 +++++++++++++---------- > 1 file changed, 13 insertions(+), 10 deletions(-) > > diff --git a/drivers/iio/magnetometer/yamaha-yas530.c b/drivers/iio/magnetometer/yamaha-yas530.c > index 026f71e524f3..58f527cfde07 100644 > --- a/drivers/iio/magnetometer/yamaha-yas530.c > +++ b/drivers/iio/magnetometer/yamaha-yas530.c > @@ -32,6 +32,7 @@ > #include <linux/mod_devicetable.h> > #include <linux/mutex.h> > #include <linux/pm_runtime.h> > +#include <linux/property.h> > #include <linux/regmap.h> > #include <linux/regulator/consumer.h> > #include <linux/random.h> > @@ -1437,8 +1438,10 @@ static int yas5xx_probe(struct i2c_client *i2c, > goto assert_reset; > } > > - yas5xx->chip_info = &yas5xx_chip_info_tbl[id->driver_data]; > - ci = yas5xx->chip_info; > + ci = device_get_match_data(dev); > + if (!ci) > + ci = (const struct yas5xx_chip_info *)id->driver_data; > + yas5xx->chip_info = ci; > > ret = regmap_read(yas5xx->map, YAS5XX_DEVICE_ID, &id_check); > if (ret) > @@ -1583,19 +1586,19 @@ static DEFINE_RUNTIME_DEV_PM_OPS(yas5xx_dev_pm_ops, yas5xx_runtime_suspend, > yas5xx_runtime_resume, NULL); > > static const struct i2c_device_id yas5xx_id[] = { > - {"yas530", yas530 }, > - {"yas532", yas532 }, > - {"yas533", yas533 }, > - {"yas537", yas537 }, > + {"yas530", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas530] }, > + {"yas532", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas532] }, > + {"yas533", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas533] }, > + {"yas537", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas537] }, > {} > }; > MODULE_DEVICE_TABLE(i2c, yas5xx_id); > > static const struct of_device_id yas5xx_of_match[] = { > - { .compatible = "yamaha,yas530", }, > - { .compatible = "yamaha,yas532", }, > - { .compatible = "yamaha,yas533", }, > - { .compatible = "yamaha,yas537", }, > + { .compatible = "yamaha,yas530", &yas5xx_chip_info_tbl[yas530] }, > + { .compatible = "yamaha,yas532", &yas5xx_chip_info_tbl[yas532] }, > + { .compatible = "yamaha,yas533", &yas5xx_chip_info_tbl[yas533] }, > + { .compatible = "yamaha,yas537", &yas5xx_chip_info_tbl[yas537] }, > {} > }; > MODULE_DEVICE_TABLE(of, yas5xx_of_match);
diff --git a/drivers/iio/magnetometer/yamaha-yas530.c b/drivers/iio/magnetometer/yamaha-yas530.c index 026f71e524f3..58f527cfde07 100644 --- a/drivers/iio/magnetometer/yamaha-yas530.c +++ b/drivers/iio/magnetometer/yamaha-yas530.c @@ -32,6 +32,7 @@ #include <linux/mod_devicetable.h> #include <linux/mutex.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/random.h> @@ -1437,8 +1438,10 @@ static int yas5xx_probe(struct i2c_client *i2c, goto assert_reset; } - yas5xx->chip_info = &yas5xx_chip_info_tbl[id->driver_data]; - ci = yas5xx->chip_info; + ci = device_get_match_data(dev); + if (!ci) + ci = (const struct yas5xx_chip_info *)id->driver_data; + yas5xx->chip_info = ci; ret = regmap_read(yas5xx->map, YAS5XX_DEVICE_ID, &id_check); if (ret) @@ -1583,19 +1586,19 @@ static DEFINE_RUNTIME_DEV_PM_OPS(yas5xx_dev_pm_ops, yas5xx_runtime_suspend, yas5xx_runtime_resume, NULL); static const struct i2c_device_id yas5xx_id[] = { - {"yas530", yas530 }, - {"yas532", yas532 }, - {"yas533", yas533 }, - {"yas537", yas537 }, + {"yas530", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas530] }, + {"yas532", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas532] }, + {"yas533", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas533] }, + {"yas537", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas537] }, {} }; MODULE_DEVICE_TABLE(i2c, yas5xx_id); static const struct of_device_id yas5xx_of_match[] = { - { .compatible = "yamaha,yas530", }, - { .compatible = "yamaha,yas532", }, - { .compatible = "yamaha,yas533", }, - { .compatible = "yamaha,yas537", }, + { .compatible = "yamaha,yas530", &yas5xx_chip_info_tbl[yas530] }, + { .compatible = "yamaha,yas532", &yas5xx_chip_info_tbl[yas532] }, + { .compatible = "yamaha,yas533", &yas5xx_chip_info_tbl[yas533] }, + { .compatible = "yamaha,yas537", &yas5xx_chip_info_tbl[yas537] }, {} }; MODULE_DEVICE_TABLE(of, yas5xx_of_match);
Unify ID tables to use pointers for driver data. It will allow to simplify the driver later on. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: left ID fallback in place (Jonathan) drivers/iio/magnetometer/yamaha-yas530.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)