aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-09-27 10:34:29 -0400
committerMark Brown <broonie@linaro.org>2013-10-03 08:52:43 -0400
commit235907422548aae38d03a545f20fceb728b70ddd (patch)
tree863ec5301a124120b5a1b9c86058638e057792b5 /drivers
parent600ba98bff438510dc81fc1ba9048420479bbded (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/meter/ade7753.c3
-rw-r--r--drivers/staging/iio/meter/ade7754.c3
-rw-r--r--drivers/staging/iio/meter/ade7759.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 74025fbae679..abfc8bd1794d 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,
86 struct ade7753_state *st = iio_priv(indio_dev); 86 struct ade7753_state *st = iio_priv(indio_dev);
87 ssize_t ret; 87 ssize_t ret;
88 88
89 ret = spi_w8r16(st->us, ADE7753_READ_REG(reg_address)); 89 ret = spi_w8r16be(st->us, ADE7753_READ_REG(reg_address));
90 if (ret < 0) { 90 if (ret < 0) {
91 dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X", 91 dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
92 reg_address); 92 reg_address);
@@ -94,7 +94,6 @@ static int ade7753_spi_read_reg_16(struct device *dev,
94 } 94 }
95 95
96 *val = ret; 96 *val = ret;
97 *val = be16_to_cpup(val);
98 97
99 return 0; 98 return 0;
100} 99}
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index f649ebe55a04..3d1c02cd6538 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,
86 struct ade7754_state *st = iio_priv(indio_dev); 86 struct ade7754_state *st = iio_priv(indio_dev);
87 int ret; 87 int ret;
88 88
89 ret = spi_w8r16(st->us, ADE7754_READ_REG(reg_address)); 89 ret = spi_w8r16be(st->us, ADE7754_READ_REG(reg_address));
90 if (ret < 0) { 90 if (ret < 0) {
91 dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X", 91 dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
92 reg_address); 92 reg_address);
@@ -94,7 +94,6 @@ static int ade7754_spi_read_reg_16(struct device *dev,
94 } 94 }
95 95
96 *val = ret; 96 *val = ret;
97 *val = be16_to_cpup(val);
98 97
99 return 0; 98 return 0;
100} 99}
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index d214ac4932cb..7467e51fd424 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,
86 struct ade7759_state *st = iio_priv(indio_dev); 86 struct ade7759_state *st = iio_priv(indio_dev);
87 int ret; 87 int ret;
88 88
89 ret = spi_w8r16(st->us, ADE7759_READ_REG(reg_address)); 89 ret = spi_w8r16be(st->us, ADE7759_READ_REG(reg_address));
90 if (ret < 0) { 90 if (ret < 0) {
91 dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X", 91 dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
92 reg_address); 92 reg_address);
@@ -94,7 +94,6 @@ static int ade7759_spi_read_reg_16(struct device *dev,
94 } 94 }
95 95
96 *val = ret; 96 *val = ret;
97 *val = be16_to_cpup(val);
98 97
99 return 0; 98 return 0;
100} 99}