iio: Drop Duplicated "mount-matrix" parameter
Subsystems (7)
PATCH 1/1 iio: Drop Duplicated "mount-matrix" parameter
All of the users of iio_read_mount_matrix() are using the very same property name. Moreover, the property name is hard coded in the API documentation.
Make this clear and avoid duplication now and in the future.
---
I have decided to get this done in a single patch due to several things:
- avoidance of unneeded churn with obsoleting APIs
- all users are under one subsystem anyway
- the atomicity of the change allows to stop new duplication to come
- if anything, we will need to revert entire series and single patch here may be better solution
But I can redo (although I really want to avoid this) as a series if there is a strong opinion why it should be split.
Linus, feel free to prepend this in your series where you are adding a few new users.
drivers/iio/accel/bma180.c | 3 +-- drivers/iio/accel/bma400_core.c | 2 +- drivers/iio/accel/bmc150-accel-core.c | 3 +-- drivers/iio/accel/fxls8962af-core.c | 2 +- drivers/iio/accel/kxcjk-1013.c | 3 +-- drivers/iio/accel/kxsd9.c | 2 +- drivers/iio/gyro/bmg160_core.c | 3 +-- drivers/iio/gyro/itg3200_core.c | 3 +-- drivers/iio/gyro/mpu3050-core.c | 2 +- drivers/iio/imu/bmi160/bmi160_core.c | 3 +-- drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 +-- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- drivers/iio/industrialio-core.c | 7 ++----- drivers/iio/magnetometer/ak8974.c | 3 +-- drivers/iio/magnetometer/ak8975.c | 2 +- drivers/iio/magnetometer/bmc150_magn.c | 3 +-- drivers/iio/magnetometer/hmc5843_core.c | 3 +-- drivers/iio/magnetometer/yamaha-yas530.c | 2 +- include/linux/iio/iio.h | 3 +-- 20 files changed, 21 insertions(+), 35 deletions(-)
drivers/iio/accel/bma180.c +1 -2
@@ -1001,8 +1001,7 @@ static int bma180_probe(struct i2c_client *client, chip = id->driver_data; data->part_info = &bma180_part_info[chip]; - ret =iio_read_mount_matrix (dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/accel/bma400_core.c +1 -1
@@ -811,7 +811,7 @@ int bma400_probe(struct device *dev, struct regmap *regmap, const char *name)if (ret)return ret; - ret =iio_read_mount_matrix (dev,"mount-matrix" , &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/accel/bmc150-accel-core.c +1 -2
@@ -1685,8 +1685,7 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, data->regmap = regmap;if (!bmc150_apply_acpi_orientation (dev, &data->orientation)) { - ret =iio_read_mount_matrix (dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret; }
drivers/iio/accel/fxls8962af-core.c +1 -1
@@ -862,7 +862,7 @@ int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq)dev_set_drvdata (dev, indio_dev); data->regmap = regmap; - ret =iio_read_mount_matrix (dev,"mount-matrix" , &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/accel/kxcjk-1013.c +1 -2
@@ -1455,8 +1455,7 @@ static int kxcjk1013_probe(struct i2c_client *client, }else { data->active_high_intr = true;/* default polarity */ - ret =iio_read_mount_matrix (&client->dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (&client->dev, &data->orientation);if (ret)return ret; }
drivers/iio/accel/kxsd9.c +1 -1
@@ -420,7 +420,7 @@ int kxsd9_common_probe(struct device *dev, indio_dev->available_scan_masks = kxsd9_scan_masks;/* Read the mounting matrix, if present */ - ret =iio_read_mount_matrix (dev,"mount-matrix" , &st->orientation); + ret =iio_read_mount_matrix (dev, &st->orientation);if (ret)return ret;
drivers/iio/gyro/bmg160_core.c +1 -2
@@ -1106,8 +1106,7 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,if (ret)return ret; - ret =iio_read_mount_matrix (dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/gyro/itg3200_core.c +1 -2
@@ -308,8 +308,7 @@ static int itg3200_probe(struct i2c_client *client, st =iio_priv (indio_dev); - ret =iio_read_mount_matrix (&client->dev,"mount-matrix" , - &st->orientation); + ret =iio_read_mount_matrix (&client->dev, &st->orientation);if (ret)return ret;
drivers/iio/gyro/mpu3050-core.c +1 -1
@@ -1164,7 +1164,7 @@ int mpu3050_common_probe(struct device *dev, mpu3050->divisor =99 ;/* Read the mounting matrix, if present */ - ret =iio_read_mount_matrix (dev,"mount-matrix" , &mpu3050->orientation); + ret =iio_read_mount_matrix (dev, &mpu3050->orientation);if (ret)return ret;
drivers/iio/imu/bmi160/bmi160_core.c +1 -2
@@ -852,8 +852,7 @@ int bmi160_core_probe(struct device *dev, struct regmap *regmap,return ret; } - ret =iio_read_mount_matrix (dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c +1 -1
@@ -592,7 +592,7 @@ int inv_icm42600_core_probe(struct regmap *regmap, int chip, int irq, st->chip = chip; st->map = regmap; - ret =iio_read_mount_matrix (dev,"mount-matrix" , &st->orientation); + ret =iio_read_mount_matrix (dev, &st->orientation);if (ret) {dev_err (dev,"failed to retrieve mounting matrix %d\n" , ret);return ret;
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +1 -2
@@ -1455,8 +1455,7 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, pdata =dev_get_platdata (dev);if (!pdata) { - result =iio_read_mount_matrix (dev,"mount-matrix" , - &st->orientation); + result =iio_read_mount_matrix (dev, &st->orientation);if (result) {dev_err (dev,"Failed to retrieve mounting matrix %d\n" , result);
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +1 -1
@@ -2256,7 +2256,7 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,return err; } - err =iio_read_mount_matrix (hw->dev,"mount-matrix" , &hw->orientation); + err =iio_read_mount_matrix (hw->dev, &hw->orientation);if (err)return err;
drivers/iio/industrialio-core.c +2 -5
@@ -617,7 +617,6 @@ EXPORT_SYMBOL_GPL(iio_show_mount_matrix);* iio_read_mount_matrix() - retrieve iio device mounting matrix from * device "mount-matrix" property * @dev: device the mounting matrix property is assigned to -* @propname: device specific mounting matrix property name * @matrix: where to store retrieved matrix * * If device is assigned no mounting matrix property, a default 3x3 identity
@@ -625,14 +624,12 @@ EXPORT_SYMBOL_GPL(iio_show_mount_matrix);* * Return: 0 if success, or a negative error code on failure. */ -int iio_read_mount_matrix (struct device *dev,const char *propname, -struct iio_mount_matrix *matrix) +int iio_read_mount_matrix (struct device *dev,struct iio_mount_matrix *matrix) {size_t len =ARRAY_SIZE (iio_mount_idmatrix.rotation);int err; - err =device_property_read_string_array (dev, propname, - matrix->rotation, len); + err =device_property_read_string_array (dev,"mount-matrix" , matrix->rotation, len);if (err == len)return 0 ;
drivers/iio/magnetometer/ak8974.c +1 -2
@@ -833,8 +833,7 @@ static int ak8974_probe(struct i2c_client *i2c, ak8974->i2c = i2c;mutex_init (&ak8974->lock); - ret =iio_read_mount_matrix (&i2c->dev,"mount-matrix" , - &ak8974->orientation); + ret =iio_read_mount_matrix (&i2c->dev, &ak8974->orientation);if (ret)return ret;
drivers/iio/magnetometer/ak8975.c +1 -1
@@ -890,7 +890,7 @@ static int ak8975_probe(struct i2c_client *client, data->reset_gpiod = reset_gpiod; data->eoc_irq =0 ; - err =iio_read_mount_matrix (&client->dev,"mount-matrix" , &data->orientation); + err =iio_read_mount_matrix (&client->dev, &data->orientation);if (err)return err;
drivers/iio/magnetometer/bmc150_magn.c +1 -2
@@ -890,8 +890,7 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,if (ret)return dev_err_probe (dev, ret,"failed to get regulators\n" ); - ret =iio_read_mount_matrix (dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/magnetometer/hmc5843_core.c +1 -2
@@ -637,8 +637,7 @@ int hmc5843_common_probe(struct device *dev, struct regmap *regmap, data->variant = &hmc5843_chip_info_tbl[id];mutex_init (&data->lock); - ret =iio_read_mount_matrix (dev,"mount-matrix" , - &data->orientation); + ret =iio_read_mount_matrix (dev, &data->orientation);if (ret)return ret;
drivers/iio/magnetometer/yamaha-yas530.c +1 -1
@@ -831,7 +831,7 @@ static int yas5xx_probe(struct i2c_client *i2c, yas5xx->dev = dev;mutex_init (&yas5xx->lock); - ret =iio_read_mount_matrix (dev,"mount-matrix" , &yas5xx->orientation); + ret =iio_read_mount_matrix (dev, &yas5xx->orientation);if (ret)return ret;
include/linux/iio/iio.h +1 -2
@@ -127,8 +127,7 @@ struct iio_mount_matrix {ssize_t iio_show_mount_matrix (struct iio_dev *indio_dev,uintptr_t priv,const struct iio_chan_spec *chan,char *buf); -int iio_read_mount_matrix (struct device *dev,const char *propname, -struct iio_mount_matrix *matrix); +int iio_read_mount_matrix (struct device *dev,struct iio_mount_matrix *matrix);typedef const struct iio_mount_matrix * (iio_get_mount_matrix_t)(const struct iio_dev *indio_dev,
Signature · 1 line
2.30.2
Quoted 7 lines · Andy Shevchenko
All of the users of
iio_read_mount_matrix()are using the very same property name. Moreover, the property name is hard coded in the API documentation.Make this clear and avoid duplication now and in the future.
Signed-off-by Andy Shevchenko <[email protected]>
Quoted 1 line
---Good idea :)
Jonathan Cameron
maintainerQuoted 10 lines · On Tue, 18 May 2021 14:38:24 +0200 Sean Nyekjaer <[email protected]> wrote:
Quoted 7 lines · Andy Shevchenko
All of the users of
iio_read_mount_matrix()are using the very same property name. Moreover, the property name is hard coded in the API documentation.Make this clear and avoid duplication now and in the future.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Sean Nyekjaer <[email protected]>Quoted 1 line
---Good idea :)
Agreed :)
Applied to the togreg branch of iio.git and pushed out as testing. @Linus, if you happen to send an update of your series out that doesn't take this into account I can fix up whilst applying.
Thanks,
Jonathan
Quoted 7 lines · Andy Shevchenko
All of the users of
iio_read_mount_matrix()are using the very same property name. Moreover, the property name is hard coded in the API documentation.Make this clear and avoid duplication now and in the future.
Signed-off-by Andy Shevchenko <[email protected]>
Excellent patch!
I will simply stick it in front in my branch when I resend the series so it applies cleanly on top of this patch.
Yours,
Linus Walleij