diff options
| author | Jean Delvare <khali@linux-fr.org> | 2011-11-04 11:00:47 (GMT) |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2011-11-04 11:00:47 (GMT) |
| commit | 90f4102ce59226954edbe960b2434d8b3da5f086 (patch) | |
| tree | 93fd275039932253b16ea125c1ba5eea2995b719 /drivers/hwmon/smm665.c | |
| parent | 371f2e083b9b081adf68d04fba4978a27dc4e618 (diff) | |
| download | linux-90f4102ce59226954edbe960b2434d8b3da5f086.tar.xz | |
hwmon: Use i2c_smbus_{read,write}_word_swapped
Make use of the new i2c_smbus_{read,write}_word_swapped functions.
This makes the driver code more compact and readable. It also ensures
proper error handling.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Guillaume Ligneul <guillaume.ligneul@gmail.com>
Diffstat (limited to 'drivers/hwmon/smm665.c')
| -rw-r--r-- | drivers/hwmon/smm665.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/hwmon/smm665.c b/drivers/hwmon/smm665.c index 425df5b..4116381 100644 --- a/drivers/hwmon/smm665.c +++ b/drivers/hwmon/smm665.c @@ -214,33 +214,26 @@ static int smm665_read_adc(struct smm665_data *data, int adc) * * Neither i2c_smbus_read_byte() nor * i2c_smbus_read_block_data() worked here, - * so use i2c_smbus_read_word_data() instead. + * so use i2c_smbus_read_word_swapped() instead. * We could also try to use i2c_master_recv(), * but that is not always supported. */ - rv = i2c_smbus_read_word_data(client, 0); + rv = i2c_smbus_read_word_swapped(client, 0); if (rv < 0) { dev_dbg(&client->dev, "Failed to read ADC value: error %d", rv); return -1; } /* * Validate/verify readback adc channel (in bit 11..14). - * High byte is in lower 8 bit of rv, so only shift by 3. */ - radc = (rv >> 3) & 0x0f; + radc = (rv >> 11) & 0x0f; if (radc != adc) { dev_dbg(&client->dev, "Unexpected RADC: Expected %d got %d", adc, radc); return -EIO; } - /* - * Chip replies with H/L, while SMBus expects L/H. - * Thus, byte order is reversed, and we have to swap - * the result. - */ - rv = swab16(rv) & SMM665_ADC_MASK; - return rv; + return rv & SMM665_ADC_MASK; } static struct smm665_data *smm665_update_device(struct device *dev) |