diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 08:51:41 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 08:51:41 (GMT) |
| commit | 82f85cf98f0eb60093e8b3d606711c2d49538478 (patch) | |
| tree | 4f47b44021db56a591d0e7d8930963853493d80e /drivers/hwmon | |
| parent | 344a85117d9c9e652c0a40c6d74e39e02ceeca5d (diff) | |
| parent | 235907422548aae38d03a545f20fceb728b70ddd (diff) | |
| download | linux-82f85cf98f0eb60093e8b3d606711c2d49538478.tar.xz | |
Merge remote-tracking branch 'spi/topic/wr' into spi-next
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/adt7310.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c index da5f078..5994cf6 100644 --- a/drivers/hwmon/adt7310.c +++ b/drivers/hwmon/adt7310.c @@ -42,13 +42,8 @@ static const u8 adt7310_reg_table[] = { static int adt7310_spi_read_word(struct device *dev, u8 reg) { struct spi_device *spi = to_spi_device(dev); - int ret; - ret = spi_w8r16(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); - if (ret < 0) - return ret; - - return be16_to_cpu((__force __be16)ret); + return spi_w8r16be(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); } static int adt7310_spi_write_word(struct device *dev, u8 reg, u16 data) |