From: Jonathan Cameron Date: Fri, 30 Sep 2011 09:05:32 +0000 (+0100) Subject: staging:iio:adc:ad799x trivial: use the convenient chan struct. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5357ba3df4af9da111fb351292c9a410b1f7ab0a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging:iio:adc:ad799x trivial: use the convenient chan struct. This is much cleaner than bouncing through the various structures to get to the same thing. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index 975a3f7122cf..8a7dce05477c 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -158,12 +158,11 @@ static int ad799x_read_raw(struct iio_dev *dev_info, if (ret < 0) return ret; - *val = (ret >> st->chip_info->channel[0].scan_type.shift) & - RES_MASK(st->chip_info->channel[0].scan_type.realbits); + *val = (ret >> chan->scan_type.shift) & + RES_MASK(chan->scan_type.realbits); return IIO_VAL_INT; case (1 << IIO_CHAN_INFO_SCALE_SHARED): - scale_uv = (st->int_vref_mv * 1000) - >> st->chip_info->channel[0].scan_type.realbits; + scale_uv = (st->int_vref_mv * 1000) >> chan->scan_type.realbits; *val = scale_uv / 1000; *val2 = (scale_uv % 1000) * 1000; return IIO_VAL_INT_PLUS_MICRO;