diff options
author | Mark Brown | 2013-10-25 10:51:41 +0200 |
---|---|---|
committer | Mark Brown | 2013-10-25 10:51:41 +0200 |
commit | 82f85cf98f0eb60093e8b3d606711c2d49538478 (patch) | |
tree | 4f47b44021db56a591d0e7d8930963853493d80e /drivers/staging | |
parent | Merge remote-tracking branch 'spi/topic/txx9' into spi-next (diff) | |
parent | staging:iio:ade7753/ade7754/ade7759: Use spi_w8r16be() instead of spi_w8r16() (diff) | |
download | kernel-qcow2-linux-82f85cf98f0eb60093e8b3d606711c2d49538478.tar.gz kernel-qcow2-linux-82f85cf98f0eb60093e8b3d606711c2d49538478.tar.xz kernel-qcow2-linux-82f85cf98f0eb60093e8b3d606711c2d49538478.zip |
Merge remote-tracking branch 'spi/topic/wr' into spi-next
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/iio/meter/ade7753.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/meter/ade7754.c | 3 | ||||
-rw-r--r-- | 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 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, 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 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, 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 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, 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; } |