| Message ID | 1523637411-8531-2-git-send-email-hernan@vanguardiasur.com.ar (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 13 Apr 2018 13:36:38 -0300 Hernán Gonzalez <hernan@vanguardiasur.com.ar> wrote: > Data to read or write was being handled with the swab16() macro instead > of using i2c_smbus_{read,write}_swapped. > > Signed-off-by: Hernán Gonzalez <hernan@vanguardiasur.com.ar> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/staging/iio/cdc/ad7746.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c > index 4882dbc..53e28ae 100644 > --- a/drivers/staging/iio/cdc/ad7746.c > +++ b/drivers/staging/iio/cdc/ad7746.c > @@ -451,7 +451,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev, > goto out; > } > > - ret = i2c_smbus_write_word_data(chip->client, reg, swab16(val)); > + ret = i2c_smbus_write_word_swapped(chip->client, reg, val); > if (ret < 0) > goto out; > > @@ -462,8 +462,8 @@ static int ad7746_write_raw(struct iio_dev *indio_dev, > ret = -EINVAL; > goto out; > } > - ret = i2c_smbus_write_word_data(chip->client, > - AD7746_REG_CAP_OFFH, swab16(val)); > + ret = i2c_smbus_write_word_swapped(chip->client, > + AD7746_REG_CAP_OFFH, val); > if (ret < 0) > goto out; > > @@ -594,21 +594,21 @@ static int ad7746_read_raw(struct iio_dev *indio_dev, > goto out; > } > > - ret = i2c_smbus_read_word_data(chip->client, reg); > + ret = i2c_smbus_read_word_swapped(chip->client, reg); > if (ret < 0) > goto out; > /* 1 + gain_val / 2^16 */ > *val = 1; > - *val2 = (15625 * swab16(ret)) / 1024; > + *val2 = (15625 * ret) / 1024; > > ret = IIO_VAL_INT_PLUS_MICRO; > break; > case IIO_CHAN_INFO_CALIBBIAS: > - ret = i2c_smbus_read_word_data(chip->client, > - AD7746_REG_CAP_OFFH); > + ret = i2c_smbus_read_word_swapped(chip->client, > + AD7746_REG_CAP_OFFH); > if (ret < 0) > goto out; > - *val = swab16(ret); > + *val = ret; > > ret = IIO_VAL_INT; > break; -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c index 4882dbc..53e28ae 100644 --- a/drivers/staging/iio/cdc/ad7746.c +++ b/drivers/staging/iio/cdc/ad7746.c @@ -451,7 +451,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev, goto out; } - ret = i2c_smbus_write_word_data(chip->client, reg, swab16(val)); + ret = i2c_smbus_write_word_swapped(chip->client, reg, val); if (ret < 0) goto out; @@ -462,8 +462,8 @@ static int ad7746_write_raw(struct iio_dev *indio_dev, ret = -EINVAL; goto out; } - ret = i2c_smbus_write_word_data(chip->client, - AD7746_REG_CAP_OFFH, swab16(val)); + ret = i2c_smbus_write_word_swapped(chip->client, + AD7746_REG_CAP_OFFH, val); if (ret < 0) goto out; @@ -594,21 +594,21 @@ static int ad7746_read_raw(struct iio_dev *indio_dev, goto out; } - ret = i2c_smbus_read_word_data(chip->client, reg); + ret = i2c_smbus_read_word_swapped(chip->client, reg); if (ret < 0) goto out; /* 1 + gain_val / 2^16 */ *val = 1; - *val2 = (15625 * swab16(ret)) / 1024; + *val2 = (15625 * ret) / 1024; ret = IIO_VAL_INT_PLUS_MICRO; break; case IIO_CHAN_INFO_CALIBBIAS: - ret = i2c_smbus_read_word_data(chip->client, - AD7746_REG_CAP_OFFH); + ret = i2c_smbus_read_word_swapped(chip->client, + AD7746_REG_CAP_OFFH); if (ret < 0) goto out; - *val = swab16(ret); + *val = ret; ret = IIO_VAL_INT; break;
Data to read or write was being handled with the swab16() macro instead of using i2c_smbus_{read,write}_swapped. Signed-off-by: Hernán Gonzalez <hernan@vanguardiasur.com.ar> --- drivers/staging/iio/cdc/ad7746.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)