Skip to content

Commit

Permalink
iio:adc:ti-adc084s021 Tidy up endian types
Browse files Browse the repository at this point in the history
By adding a few local variables and avoiding a void * for
a parameter we can easily make all the endian types explicit and
get rid of the warnings from sparse:

  CHECK   drivers/iio/adc/ti-adc084s021.c
drivers/iio/adc/ti-adc084s021.c:84:26: warning: incorrect type in assignment (different base types)
drivers/iio/adc/ti-adc084s021.c:84:26:    expected unsigned short [usertype]
drivers/iio/adc/ti-adc084s021.c:84:26:    got restricted __be16
drivers/iio/adc/ti-adc084s021.c:115:24: warning: cast to restricted __be16
drivers/iio/adc/ti-adc084s021.c:115:24: warning: cast to restricted __be16
drivers/iio/adc/ti-adc084s021.c:115:24: warning: cast to restricted __be16
drivers/iio/adc/ti-adc084s021.c:115:24: warning: cast to restricted __be16

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20200722155103.979802-23-jic23@kernel.org
  • Loading branch information
Jonathan Cameron authored and Jonathan Cameron committed Dec 3, 2020
1 parent eca8523 commit a96bd58
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/iio/adc/ti-adc084s021.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,18 @@ static const struct iio_chan_spec adc084s021_channels[] = {
* @adc: The ADC SPI data.
* @data: Buffer for converted data.
*/
static int adc084s021_adc_conversion(struct adc084s021 *adc, void *data)
static int adc084s021_adc_conversion(struct adc084s021 *adc, __be16 *data)
{
int n_words = (adc->spi_trans.len >> 1) - 1; /* Discard first word */
int ret, i = 0;
u16 *p = data;

/* Do the transfer */
ret = spi_sync(adc->spi, &adc->message);
if (ret < 0)
return ret;

for (; i < n_words; i++)
*(p + i) = adc->rx_buf[i + 1];
*(data + i) = adc->rx_buf[i + 1];

return ret;
}
Expand All @@ -93,6 +92,7 @@ static int adc084s021_read_raw(struct iio_dev *indio_dev,
{
struct adc084s021 *adc = iio_priv(indio_dev);
int ret;
__be16 be_val;

switch (mask) {
case IIO_CHAN_INFO_RAW:
Expand All @@ -107,13 +107,13 @@ static int adc084s021_read_raw(struct iio_dev *indio_dev,
}

adc->tx_buf[0] = channel->channel << 3;
ret = adc084s021_adc_conversion(adc, val);
ret = adc084s021_adc_conversion(adc, &be_val);
iio_device_release_direct_mode(indio_dev);
regulator_disable(adc->reg);
if (ret < 0)
return ret;

*val = be16_to_cpu(*val);
*val = be16_to_cpu(be_val);
*val = (*val >> channel->scan_type.shift) & 0xff;

return IIO_VAL_INT;
Expand Down

0 comments on commit a96bd58

Please sign in to comment.