iio: ms5611: Simplify IO callback parameters

[ Upstream commit dc19fa63ad80a636fdbc1a02153d1ab140cb901f ]

The ms5611 passes &indio_dev->dev as a parameter to all its IO callbacks
only to directly cast the struct device back to struct iio_dev. And the
struct iio_dev is then only used to get the drivers state struct.

Simplify this a bit by passing the state struct directly. This makes it a
bit easier to follow what the code is doing.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20211020142110.7060-1-lars@metafoo.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Stable-dep-of: 17f442e7e475 ("iio: pressure: ms5611: fixed value compensation bug")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/iio/pressure/ms5611.h b/drivers/iio/pressure/ms5611.h
index bc06271..345f390 100644 (file)
--- a/drivers/iio/pressure/ms5611.h
+++ b/drivers/iio/pressure/ms5611.h
@@ -50,9 +50,9 @@ struct ms5611_state {
        const struct ms5611_osr *pressure_osr;
        const struct ms5611_osr *temp_osr;
 
-       int (*reset)(struct device *dev);
-       int (*read_prom_word)(struct device *dev, int index, u16 *word);
-       int (*read_adc_temp_and_pressure)(struct device *dev,
+       int (*reset)(struct ms5611_state *st);
+       int (*read_prom_word)(struct ms5611_state *st, int index, u16 *word);
+       int (*read_adc_temp_and_pressure)(struct ms5611_state *st,
                                          s32 *temp, s32 *pressure);
 
        struct ms5611_chip_info *chip_info;

diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index 214b0d2..885ccb7 100644 (file)
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c
@@ -85,8 +85,7 @@ static int ms5611_read_prom(struct iio_dev *indio_dev)
        struct ms5611_state *st = iio_priv(indio_dev);
 
        for (i = 0; i < MS5611_PROM_WORDS_NB; i++) {
-               ret = st->read_prom_word(&indio_dev->dev,
-                                        i, &st->chip_info->prom[i]);
+               ret = st->read_prom_word(st, i, &st->chip_info->prom[i]);
                if (ret < 0) {
                        dev_err(&indio_dev->dev,
                                "failed to read prom at %d\n", i);
@@ -108,7 +107,7 @@ static int ms5611_read_temp_and_pressure(struct iio_dev *indio_dev,
        int ret;
        struct ms5611_state *st = iio_priv(indio_dev);
 
-       ret = st->read_adc_temp_and_pressure(&indio_dev->dev, temp, pressure);
+       ret = st->read_adc_temp_and_pressure(st, temp, pressure);
        if (ret < 0) {
                dev_err(&indio_dev->dev,
                        "failed to read temperature and pressure\n");
@@ -196,7 +195,7 @@ static int ms5611_reset(struct iio_dev *indio_dev)
        int ret;
        struct ms5611_state *st = iio_priv(indio_dev);
 
-       ret = st->reset(&indio_dev->dev);
+       ret = st->reset(st);
        if (ret < 0) {
                dev_err(&indio_dev->dev, "failed to reset device\n");
                return ret;

diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c
index 7c04f73..cccc40f 100644 (file)
--- a/drivers/iio/pressure/ms5611_i2c.c
+++ b/drivers/iio/pressure/ms5611_i2c.c
@@ -20,17 +20,15 @@
 
 #include "ms5611.h"
 
-static int ms5611_i2c_reset(struct device *dev)
+static int ms5611_i2c_reset(struct ms5611_state *st)
 {
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
-
        return i2c_smbus_write_byte(st->client, MS5611_RESET);
 }
 
-static int ms5611_i2c_read_prom_word(struct device *dev, int index, u16 *word)
+static int ms5611_i2c_read_prom_word(struct ms5611_state *st, int index,
+                                    u16 *word)
 {
        int ret;
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
 
        ret = i2c_smbus_read_word_swapped(st->client,
                        MS5611_READ_PROM_WORD + (index << 1));
@@ -57,11 +55,10 @@ static int ms5611_i2c_read_adc(struct ms5611_state *st, s32 *val)
        return 0;
 }
 
-static int ms5611_i2c_read_adc_temp_and_pressure(struct device *dev,
+static int ms5611_i2c_read_adc_temp_and_pressure(struct ms5611_state *st,
                                                 s32 *temp, s32 *pressure)
 {
        int ret;
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
        const struct ms5611_osr *osr = st->temp_osr;
 
        ret = i2c_smbus_write_byte(st->client, osr->cmd);

diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c
index f7743ee..3039fe8 100644 (file)
--- a/drivers/iio/pressure/ms5611_spi.c
+++ b/drivers/iio/pressure/ms5611_spi.c
@@ -15,18 +15,17 @@
 
 #include "ms5611.h"
 
-static int ms5611_spi_reset(struct device *dev)
+static int ms5611_spi_reset(struct ms5611_state *st)
 {
        u8 cmd = MS5611_RESET;
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
 
        return spi_write_then_read(st->client, &cmd, 1, NULL, 0);
 }
 
-static int ms5611_spi_read_prom_word(struct device *dev, int index, u16 *word)
+static int ms5611_spi_read_prom_word(struct ms5611_state *st, int index,
+                                    u16 *word)
 {
        int ret;
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
 
        ret = spi_w8r16be(st->client, MS5611_READ_PROM_WORD + (index << 1));
        if (ret < 0)
@@ -37,11 +36,10 @@ static int ms5611_spi_read_prom_word(struct device *dev, int index, u16 *word)
        return 0;
 }
 
-static int ms5611_spi_read_adc(struct device *dev, s32 *val)
+static int ms5611_spi_read_adc(struct ms5611_state *st, s32 *val)
 {
        int ret;
        u8 buf[3] = { MS5611_READ_ADC };
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
 
        ret = spi_write_then_read(st->client, buf, 1, buf, 3);
        if (ret < 0)
@@ -52,11 +50,10 @@ static int ms5611_spi_read_adc(struct device *dev, s32 *val)
        return 0;
 }
 
-static int ms5611_spi_read_adc_temp_and_pressure(struct device *dev,
+static int ms5611_spi_read_adc_temp_and_pressure(struct ms5611_state *st,
                                                 s32 *temp, s32 *pressure)
 {
        int ret;
-       struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev));
        const struct ms5611_osr *osr = st->temp_osr;
 
        /*
@@ -68,7 +65,7 @@ static int ms5611_spi_read_adc_temp_and_pressure(struct device *dev,
                return ret;
 
        usleep_range(osr->conv_usec, osr->conv_usec + (osr->conv_usec / 10UL));
-       ret = ms5611_spi_read_adc(dev, temp);
+       ret = ms5611_spi_read_adc(st, temp);
        if (ret < 0)
                return ret;
 
@@ -78,7 +75,7 @@ static int ms5611_spi_read_adc_temp_and_pressure(struct device *dev,
                return ret;
 
        usleep_range(osr->conv_usec, osr->conv_usec + (osr->conv_usec / 10UL));
-       return ms5611_spi_read_adc(dev, pressure);
+       return ms5611_spi_read_adc(st, pressure);
 }
 
 static int ms5611_spi_probe(struct spi_device *spi)