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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Sean Nyekjaer <sean@geanix.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210518112546.44592-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 71c76bbd81d43103d877e45ec56574144abc6dc4..97e991581960cfe2bd85e9055a105e8426a28a05 100644 (file)
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -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;
 

diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
index 7eeba80e32cb55ddaead9718cf228a31c0f0a87f..21520e022a2123ca06acc61f69246e1a2e1d7667 100644 (file)
--- a/drivers/iio/accel/bma400_core.c
+++ b/drivers/iio/accel/bma400_core.c
@@ -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;
 

diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 43cfadf8f6b70bb813b4dd657a1b158c6cc59fec..46ab7675186cf3d36bd890cd8fb6105d979f8342 100644 (file)
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -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;
        }

diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
index 9fe5a18a605cca03abbb54889392c50ff3b13fb2..078d87865fdeec758d2eb3e5397ac5a35ab4cbb7 100644 (file)
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@ -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;
 

diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 7cd6473151947dbaf8a39b9e6bca9606212b75be..a51fdd3c9b5b5b6bdfa059cceb3086fa0adfa62f 100644 (file)
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -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;
        }

diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 0e18b92e20992a69fca70ffe585236f78e6cff8c..bf7ed9e7d00f430d8e53dcc9b539c2c7dcc112cb 100644 (file)
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -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;
 

diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index a7cc2cad8bbf25f5e8b58bf87be74a77341e82c1..17b939a367ad049b78eeff14b033b1391d20c318 100644 (file)
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -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;
 

diff --git a/drivers/iio/gyro/itg3200_core.c b/drivers/iio/gyro/itg3200_core.c
index e9804664db7342673eab714da5cce72f714a3dce..a7f1bbb5f289d23b1aa61df6842b3f0f8b8abea9 100644 (file)
--- a/drivers/iio/gyro/itg3200_core.c
+++ b/drivers/iio/gyro/itg3200_core.c
@@ -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;
 

diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
index 2b930c7f4d86743ed4f2fa63dc3e2b3e8f172553..3225de1f023b35fa66355fb61b49cef5504d1fa0 100644 (file)
--- a/drivers/iio/gyro/mpu3050-core.c
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -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;
 

diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index b63bd7e5e5e550ca81a93c16946f9be678478f3b..824b5124a5f55779a29284576496d9a84f181526 100644 (file)
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -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;
 

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
index 8bd77185ccb716ede55980429224c5f74f91f38d..86858da9cc38f7a070b0c2f3c37c2baf0a0a95fd 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
@@ -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;

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 6244a07048df895cc9a8bd62c820187d0894d7f4..64704b55f6ebd00c6cc648905ec9b0b16cf3666c 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -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);

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index e8d242ee6743b4d4e2300059c05beb135b07401c..db45f1fc0b8175406980970d151b54ac25e1661b 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -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;
 

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 75e92bac78f39fac7922c5c0959ff135b8a8aba1..6d2175eb7af25af4c683e544c7dd091db0e1ca8b 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -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;
 

diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c
index 24b2f7b1fe443f7b0d02b0eb1a9af05d4af79a4c..e54feacfb9809344ce5a1f6a98f0113774ad80a4 100644 (file)
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@ -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;
 

diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index d988b6ac3659381e75e486fdda9e257cbe730d41..42b8a2680e3aad845007e4e107d10f359605c561 100644 (file)
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -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;
 

diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index 5f28220a79946aa528746ae1bca5397ffa9a95f5..f96f531753495f9029b34fb6abf20f28f41781ef 100644 (file)
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -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;
 

diff --git a/drivers/iio/magnetometer/hmc5843_core.c b/drivers/iio/magnetometer/hmc5843_core.c
index 221563e0c18fdd93c09f96afa7f6d50b6bfaed45..cf62057480cfef5305778872e84075b71ff4552e 100644 (file)
--- a/drivers/iio/magnetometer/hmc5843_core.c
+++ b/drivers/iio/magnetometer/hmc5843_core.c
@@ -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;
 

diff --git a/drivers/iio/magnetometer/yamaha-yas530.c b/drivers/iio/magnetometer/yamaha-yas530.c
index 2f2f8cb3c26cde7d374337f521a85399decbc255..9ff7b0e56cf67a8200c755a14e33f8f889166098 100644 (file)
--- a/drivers/iio/magnetometer/yamaha-yas530.c
+++ b/drivers/iio/magnetometer/yamaha-yas530.c
@@ -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;
 

diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 5606a3f4c4cbea8896d9d79590d8ca625f6260ae..324561b7a5e861f38ed289d8fce03dbe0bcff474 100644 (file)
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -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,