Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging:iio:ad7291: Use i2c_smbus_{read,write}_word_swapped instead of open-coding it

Browse Source 
No need to swap the upper and lower byte by hand if there is a helper function
which already does this.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2013-06-14 16:58:00 +01:00 committed by Jonathan Cameron
parent 3f8db0d46b
commit 7bd49fe120
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/iio/adc/ad7291.c
View File

@ -87,20 +87,20 @@ static int ad7291_i2c_read(struct ad7291_chip_info *chip, u8 reg, u16 *data)
struct i2c_client *client = chip->client; struct i2c_client *client = chip->client;
int ret = 0; int ret = 0;
ret = i2c_smbus_read_word_data(client, reg); ret = i2c_smbus_read_word_swapped(client, reg);
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "I2C read error\n"); dev_err(&client->dev, "I2C read error\n");
return ret; return ret;
} }
*data = swab16((u16)ret); *data = ret;
return 0; return 0;
} }
static int ad7291_i2c_write(struct ad7291_chip_info *chip, u8 reg, u16 data) static int ad7291_i2c_write(struct ad7291_chip_info *chip, u8 reg, u16 data)
{ {
return i2c_smbus_write_word_data(chip->client, reg, swab16(data)); return i2c_smbus_write_word_swapped(chip->client, reg, data);
} }
static irqreturn_t ad7291_event_handler(int irq, void *private) static irqreturn_t ad7291_event_handler(int irq, void *private)
@ -418,35 +418,33 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
return ret; return ret;
} }
/* Read voltage */ /* Read voltage */
ret = i2c_smbus_read_word_data(chip->client, ret = i2c_smbus_read_word_swapped(chip->client,
AD7291_VOLTAGE); AD7291_VOLTAGE);
if (ret < 0) { if (ret < 0) {
mutex_unlock(&chip->state_lock); mutex_unlock(&chip->state_lock);
return ret; return ret;
} }
*val = swab16((u16)ret) & AD7291_VALUE_MASK; *val = ret & AD7291_VALUE_MASK;
mutex_unlock(&chip->state_lock); mutex_unlock(&chip->state_lock);
return IIO_VAL_INT; return IIO_VAL_INT;
case IIO_TEMP: case IIO_TEMP:
/* Assumes tsense bit of command register always set */ /* Assumes tsense bit of command register always set */
ret = i2c_smbus_read_word_data(chip->client, ret = i2c_smbus_read_word_swapped(chip->client,
AD7291_T_SENSE); AD7291_T_SENSE);
if (ret < 0) if (ret < 0)
return ret; return ret;
signval = (s16)((swab16((u16)ret) & signval = (s16)((ret & AD7291_VALUE_MASK) << 4) >> 4;
AD7291_VALUE_MASK) << 4) >> 4;
*val = signval; *val = signval;
return IIO_VAL_INT; return IIO_VAL_INT;
default: default:
return -EINVAL; return -EINVAL;
} }
case IIO_CHAN_INFO_AVERAGE_RAW: case IIO_CHAN_INFO_AVERAGE_RAW:
ret = i2c_smbus_read_word_data(chip->client, ret = i2c_smbus_read_word_swapped(chip->client,
AD7291_T_AVERAGE); AD7291_T_AVERAGE);
if (ret < 0) if (ret < 0)
return ret; return ret;
signval = (s16)((swab16((u16)ret) & signval = (s16)((ret & AD7291_VALUE_MASK) << 4) >> 4;
AD7291_VALUE_MASK) << 4) >> 4;
*val = signval; *val = signval;
return IIO_VAL_INT; return IIO_VAL_INT;
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE: