staging:iio:ade7753/ade7754/ade7759: Use spi_w8r16be() instead of spi_w8r16()

Using spi_w8r16be() will do the conversion of the result from big endian to
native endian in the helper function. This makes the code a bit smaller and also
keeps sparse happy. Fixes the following sparse warnings:

	drivers/staging/iio/meter/ade7753.c:97:29: warning: incorrect type in argument 1 (different base types)
	drivers/staging/iio/meter/ade7753.c:97:29:    expected restricted __be16 const [usertype] *p
	drivers/staging/iio/meter/ade7753.c:97:29:    got unsigned short [usertype] *val

	drivers/staging/iio/meter/ade7754.c:97:29: warning: incorrect type in argument 1 (different base types)
	drivers/staging/iio/meter/ade7754.c:97:29:    expected restricted __be16 const [usertype] *p
	drivers/staging/iio/meter/ade7754.c:97:29:    got unsigned short [usertype] *val

	drivers/staging/iio/meter/ade7759.c:97:29: warning: incorrect type in argument 1 (different base types)
	drivers/staging/iio/meter/ade7759.c:97:29:    expected restricted __be16 const [usertype] *p
	drivers/staging/iio/meter/ade7759.c:97:29:    got unsigned short [usertype] *val

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 74025fbae6794f3c5f6226efd1b137ef42ec450c..abfc8bd1794d03e4f89e75b1362b40a22d783f17 100644 (file)
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -86,7 +86,7 @@ static int ade7753_spi_read_reg_16(struct device *dev,
        struct ade7753_state *st = iio_priv(indio_dev);
        ssize_t ret;
 
-       ret = spi_w8r16(st->us, ADE7753_READ_REG(reg_address));
+       ret = spi_w8r16be(st->us, ADE7753_READ_REG(reg_address));
        if (ret < 0) {
                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
                        reg_address);
@@ -94,7 +94,6 @@ static int ade7753_spi_read_reg_16(struct device *dev,
        }
 
        *val = ret;
-       *val = be16_to_cpup(val);
 
        return 0;
 }

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index f649ebe55a04d49da431c9c8ff5d45947d7e8ac7..3d1c02cd65384db7a9d6fa8e87eaa0542510e0db 100644 (file)
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -86,7 +86,7 @@ static int ade7754_spi_read_reg_16(struct device *dev,
        struct ade7754_state *st = iio_priv(indio_dev);
        int ret;
 
-       ret = spi_w8r16(st->us, ADE7754_READ_REG(reg_address));
+       ret = spi_w8r16be(st->us, ADE7754_READ_REG(reg_address));
        if (ret < 0) {
                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
                        reg_address);
@@ -94,7 +94,6 @@ static int ade7754_spi_read_reg_16(struct device *dev,
        }
 
        *val = ret;
-       *val = be16_to_cpup(val);
 
        return 0;
 }

diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index d214ac4932cbef428c4d414967146eb7c92cce4d..7467e51fd42497c4885a953b34e7e644358a5945 100644 (file)
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -86,7 +86,7 @@ static int ade7759_spi_read_reg_16(struct device *dev,
        struct ade7759_state *st = iio_priv(indio_dev);
        int ret;
 
-       ret = spi_w8r16(st->us, ADE7759_READ_REG(reg_address));
+       ret = spi_w8r16be(st->us, ADE7759_READ_REG(reg_address));
        if (ret < 0) {
                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
                        reg_address);
@@ -94,7 +94,6 @@ static int ade7759_spi_read_reg_16(struct device *dev,
        }
 
        *val = ret;
-       *val = be16_to_cpup(val);
 
        return 0;
 }