iio: magnetometer: yamaha-yas530: Use pointers as driver data
PATCH v2 1/3 iio: magnetometer: yamaha-yas530: Use pointers as driver data
Unify ID tables to use pointers for driver data. It will allow to simplify the driver later on.
---
v2: left ID fallback in place (Jonathan)
drivers/iio/magnetometer/yamaha-yas530.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/iio/magnetometer/yamaha-yas530.c +13 -10
@@ -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);
Signature · 1 line
2.35.1
PATCH v2 2/3 iio: magnetometer: yamaha-yas530: Make strings const in chip info
For better compiler coverage mark strings consts in the chip info.
---
v2: no changes
drivers/iio/magnetometer/yamaha-yas530.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/magnetometer/yamaha-yas530.c +2 -2
@@ -189,8 +189,8 @@ struct yas5xx;*/ struct yas5xx_chip_info {unsigned int devid; -char *product_name; -char *version_names[2 ]; +const char *product_name; +const char *version_names[2 ];const int *volatile_reg;int volatile_reg_qty;u32 scaling_val2;
Signature · 1 line
2.35.1
PATCH v2 3/3 iio: magnetometer: yamaha-yas530: Use dev_err_probe()
In reply to Andy ShevchenkoUnify error message format by using dev_err_probe().
---
v2: no changes
drivers/iio/magnetometer/yamaha-yas530.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/iio/magnetometer/yamaha-yas530.c +6 -10
@@ -1415,10 +1415,8 @@ static int yas5xx_probe(struct i2c_client *i2c,return dev_err_probe (dev, ret,"cannot get regulators\n" ); ret =regulator_bulk_enable (ARRAY_SIZE (yas5xx->regs), yas5xx->regs); -if (ret) { -dev_err (dev,"cannot enable regulators\n" ); -return ret; - } +if (ret) +return dev_err_probe (dev, ret,"cannot enable regulators\n" );/* See comment in runtime resume callback */ usleep_range (31000 ,40000 );
@@ -1426,15 +1424,13 @@ static int yas5xx_probe(struct i2c_client *i2c,/* This will take the device out of reset if need be */ yas5xx->reset =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (yas5xx->reset)) { - ret =dev_err_probe (dev,PTR_ERR (yas5xx->reset), -"failed to get reset line\n" ); + ret =dev_err_probe (dev,PTR_ERR (yas5xx->reset),"failed to get reset line\n" ); goto reg_off; } yas5xx->map =devm_regmap_init_i2c (i2c, &yas5xx_regmap_config);if (IS_ERR (yas5xx->map)) { -dev_err (dev,"failed to allocate register map\n" ); - ret =PTR_ERR (yas5xx->map); + ret =dev_err_probe (dev,PTR_ERR (yas5xx->map),"failed to allocate register map\n" ); goto assert_reset; }
@@ -1484,13 +1480,13 @@ static int yas5xx_probe(struct i2c_client *i2c, yas5xx_handle_trigger, NULL);if (ret) { -dev_err (dev,"triggered buffer setup failed\n" ); +dev_err_probe (dev, ret,"triggered buffer setup failed\n" ); goto assert_reset; } ret =iio_device_register (indio_dev);if (ret) { -dev_err (dev,"device register failed\n" ); +dev_err_probe (dev, ret,"device register failed\n" ); goto cleanup_buffer; }
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerQuoted 4 lines · On Wed, 31 Aug 2022 17:15:28 +0300 Andy Shevchenko…
Unify ID tables to use pointers for driver data. It will allow to simplify the driver later on.
Signed-off-by Andy Shevchenko <[email protected]>
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
Quoted 58 lines
---
v2: left ID fallback in place (Jonathan)drivers/iio/magnetometer/yamaha-yas530.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)drivers/iio/magnetometer/yamaha-yas530.c +13
-10@@ -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);