diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 01:01:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 01:01:39 -0500 |
commit | f095ca6b31cfd20e6e7e0338ed8548d8a4374287 (patch) | |
tree | 1305b11e76affa8e9738b0e236ac2881d7057ce2 /drivers/hwmon | |
parent | c6d65bf246fbba6e9042a35aba050d2a92f39505 (diff) | |
parent | 82f85cf98f0eb60093e8b3d606711c2d49538478 (diff) |
Merge tag 'spi-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown:
"As well as the usual driver updates and cleanups there's a few
improvements to the core here:
- The start of some improvements to factor out more of the SPI
message loop into the core. Right now this is just simplifying the
code a bit but hopefully next time around we'll also have managed
to roll out some noticable performance improvements which drivers
can take advantage of.
- Support for loading modules for ACPI enumerated SPI devices.
- Managed registration for SPI controllers.
- Helper for another common I/O pattern"
* tag 'spi-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (116 commits)
spi/hspi: add device tree support
spi: atmel: fix return value check in atmel_spi_probe()
spi: spi-imx: only enable the clocks when we start to transfer a message
spi/s3c64xx: Fix doubled clock disable on suspend
spi/s3c64xx: Do not ignore return value of spi_master_resume/suspend
spi: spi-mxs: Use u32 instead of uint32_t
spi: spi-mxs: Don't set clock for each xfer
spi: spi-mxs: Clean up setup_transfer function
spi: spi-mxs: Remove check of spi mode bits
spi: spi-mxs: Fix race in setup method
spi: spi-mxs: Remove bogus setting of ssp clk rate field
spi: spi-mxs: Remove full duplex check, spi core already does it
spi: spi-mxs: Fix chip select control bits in DMA mode
spi: spi-mxs: Fix extra CS pulses and read mode in multi-transfer messages
spi: spi-mxs: Change flag arguments in txrx functions to bit flags
spi: spi-mxs: Always clear INGORE_CRC, to keep CS asserted
spi: spi-mxs: Remove mxs_spi_enable and mxs_spi_disable
spi: spi-mxs: Always set LOCK_CS
spi/s3c64xx: Add missing pm_runtime_put on setup fail
spi/s3c64xx: Add missing pm_runtime_set_active() call in probe()
...
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 da5f0789fb97..5994cf68e0a4 100644 --- a/drivers/hwmon/adt7310.c +++ b/drivers/hwmon/adt7310.c | |||
@@ -42,13 +42,8 @@ static const u8 adt7310_reg_table[] = { | |||
42 | static int adt7310_spi_read_word(struct device *dev, u8 reg) | 42 | static int adt7310_spi_read_word(struct device *dev, u8 reg) |
43 | { | 43 | { |
44 | struct spi_device *spi = to_spi_device(dev); | 44 | struct spi_device *spi = to_spi_device(dev); |
45 | int ret; | ||
46 | 45 | ||
47 | ret = spi_w8r16(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); | 46 | return spi_w8r16be(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); |
48 | if (ret < 0) | ||
49 | return ret; | ||
50 | |||
51 | return be16_to_cpu((__force __be16)ret); | ||
52 | } | 47 | } |
53 | 48 | ||
54 | static int adt7310_spi_write_word(struct device *dev, u8 reg, u16 data) | 49 | static int adt7310_spi_write_word(struct device *dev, u8 reg, u16 data) |