From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out-146.synserver.de ([212.40.185.146]:1028 "EHLO smtp-out-141.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932292Ab2DMITo (ORCPT ); Fri, 13 Apr 2012 04:19:44 -0400 Message-ID: <4F87E230.5080705@metafoo.de> Date: Fri, 13 Apr 2012 10:22:08 +0200 From: Lars-Peter Clausen MIME-Version: 1.0 To: Jonathan Cameron CC: linux-iio@vger.kernel.org, device-drivers-devel@blackfin.uclinux.org Subject: Re: [PATCH V2] staging:iio:adc:ad7476 unwind use of IIO_CHAN macro. References: <4F85534B.6000809@metafoo.de> <1334166089-29534-1-git-send-email-jic23@kernel.org> In-Reply-To: <1334166089-29534-1-git-send-email-jic23@kernel.org> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 04/11/2012 07:41 PM, Jonathan Cameron wrote: > This macro is being removed to simplify ongoing maintenance > so we need to unwind and remaining users. > > V2 has the cleanup Lars-Peter suggested. > > Signed-off-by: Jonathan Cameron Looks good, thanks. Acked-by: Lars-Peter Clausen > > --- > Basically this now makes use of the fact that the shift + bits = 12 in > all cases. > > drivers/staging/iio/adc/ad7476_core.c | 45 +++++++++++++++------------------ > 1 file changed, 21 insertions(+), 24 deletions(-) > > diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c > index 0c064d1..694b508 100644 > --- a/drivers/staging/iio/adc/ad7476_core.c > +++ b/drivers/staging/iio/adc/ad7476_core.c > @@ -66,53 +66,50 @@ static int ad7476_read_raw(struct iio_dev *indio_dev, > return -EINVAL; > } > > +#define AD7476_CHAN(bits) \ > + { \ > + .type = IIO_VOLTAGE, \ > + .indexed = 1, \ > + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT, \ > + .scan_type = { \ > + .sign = 'u', \ > + .realbits = bits, \ > + .storagebits = 16, \ > + .shift = 12 - bits, \ > + }, \ > +} > + > static const struct ad7476_chip_info ad7476_chip_info_tbl[] = { > [ID_AD7466] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 12, 16, 0), 0), > + .channel[0] = AD7476_CHAN(12), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7467] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 10, 16, 2), 0), > + .channel[0] = AD7476_CHAN(10), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7468] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1 , 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 8, 16, 4), 0), > + .channel[0] = AD7476_CHAN(8), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7475] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 12, 16, 0), 0), > + .channel[0] = AD7476_CHAN(12), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7476] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 12, 16, 0), 0), > + .channel[0] = AD7476_CHAN(12), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7477] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 10, 16, 2), 0), > + .channel[0] = AD7476_CHAN(10), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7478] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 8, 16, 4), 0), > + .channel[0] = AD7476_CHAN(8), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > }, > [ID_AD7495] = { > - .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0, > - IIO_CHAN_INFO_SCALE_SHARED_BIT, > - 0, 0, IIO_ST('u', 12, 16, 0), 0), > + .channel[0] = AD7476_CHAN(12), > .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1), > .int_vref_mv = 2500, > },