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 <[email protected]>
---
drivers/staging/iio/meter/ade7753.c | 3 +--
drivers/staging/iio/meter/ade7754.c | 3 +--
drivers/staging/iio/meter/ade7759.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7753.c
b/drivers/staging/iio/meter/ade7753.c
index 6200335..00492ca 100644
--- 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 2e046f6..e0aa13a 100644
--- 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 145f896..ea0c9de 100644
--- 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;
}
--
1.8.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
