From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.19.201]:44006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754760AbaFNPBj (ORCPT ); Sat, 14 Jun 2014 11:01:39 -0400 Message-ID: <539C6448.9000704@kernel.org> Date: Sat, 14 Jun 2014 16:03:36 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Peter Meerwald , linux-iio@vger.kernel.org Subject: Re: [PATCH v2 03/12] iio:adc:ad7887: Use BIT() and GENMASK() macros References: <1402549229-4449-1-git-send-email-pmeerw@pmeerw.net> <1402549229-4449-4-git-send-email-pmeerw@pmeerw.net> In-Reply-To: <1402549229-4449-4-git-send-email-pmeerw@pmeerw.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 12/06/14 06:00, Peter Meerwald wrote: > Signed-off-by: Peter Meerwald > Acked-by: Lars-Peter Clausen Applied to the togreg branch of iio.git thanks > --- > drivers/iio/adc/ad7887.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c > index 749a6ca..2fd012e 100644 > --- a/drivers/iio/adc/ad7887.c > +++ b/drivers/iio/adc/ad7887.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -25,14 +26,14 @@ > > #include > > -#define AD7887_REF_DIS (1 << 5) /* on-chip reference disable */ > -#define AD7887_DUAL (1 << 4) /* dual-channel mode */ > -#define AD7887_CH_AIN1 (1 << 3) /* convert on channel 1, DUAL=1 */ > -#define AD7887_CH_AIN0 (0 << 3) /* convert on channel 0, DUAL=0,1 */ > -#define AD7887_PM_MODE1 (0) /* CS based shutdown */ > -#define AD7887_PM_MODE2 (1) /* full on */ > -#define AD7887_PM_MODE3 (2) /* auto shutdown after conversion */ > -#define AD7887_PM_MODE4 (3) /* standby mode */ > +#define AD7887_REF_DIS BIT(5) /* on-chip reference disable */ > +#define AD7887_DUAL BIT(4) /* dual-channel mode */ > +#define AD7887_CH_AIN1 BIT(3) /* convert on channel 1, DUAL=1 */ > +#define AD7887_CH_AIN0 0 /* convert on channel 0, DUAL=0,1 */ > +#define AD7887_PM_MODE1 0 /* CS based shutdown */ > +#define AD7887_PM_MODE2 1 /* full on */ > +#define AD7887_PM_MODE3 2 /* auto shutdown after conversion */ > +#define AD7887_PM_MODE4 3 /* standby mode */ > > enum ad7887_channels { > AD7887_CH0, > @@ -40,8 +41,6 @@ enum ad7887_channels { > AD7887_CH1, > }; > > -#define RES_MASK(bits) ((1 << (bits)) - 1) > - > /** > * struct ad7887_chip_info - chip specifc information > * @int_vref_mv: the internal reference voltage > @@ -167,7 +166,7 @@ static int ad7887_read_raw(struct iio_dev *indio_dev, > if (ret < 0) > return ret; > *val = ret >> chan->scan_type.shift; > - *val &= RES_MASK(chan->scan_type.realbits); > + *val &= GENMASK(chan->scan_type.realbits - 1, 0); > return IIO_VAL_INT; > case IIO_CHAN_INFO_SCALE: > if (st->reg) { >