Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio:adc:ad7887: Use BIT() and GENMASK() macros

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Peter Meerwald and committed by
Jonathan Cameron
09a1737e a476bc02

+10 -11
+10 -11
drivers/iio/adc/ad7887.c
··· 15 15 #include <linux/err.h> 16 16 #include <linux/module.h> 17 17 #include <linux/interrupt.h> 18 + #include <linux/bitops.h> 18 19 19 20 #include <linux/iio/iio.h> 20 21 #include <linux/iio/sysfs.h> ··· 26 25 27 26 #include <linux/platform_data/ad7887.h> 28 27 29 - #define AD7887_REF_DIS (1 << 5) /* on-chip reference disable */ 30 - #define AD7887_DUAL (1 << 4) /* dual-channel mode */ 31 - #define AD7887_CH_AIN1 (1 << 3) /* convert on channel 1, DUAL=1 */ 32 - #define AD7887_CH_AIN0 (0 << 3) /* convert on channel 0, DUAL=0,1 */ 33 - #define AD7887_PM_MODE1 (0) /* CS based shutdown */ 34 - #define AD7887_PM_MODE2 (1) /* full on */ 35 - #define AD7887_PM_MODE3 (2) /* auto shutdown after conversion */ 36 - #define AD7887_PM_MODE4 (3) /* standby mode */ 28 + #define AD7887_REF_DIS BIT(5) /* on-chip reference disable */ 29 + #define AD7887_DUAL BIT(4) /* dual-channel mode */ 30 + #define AD7887_CH_AIN1 BIT(3) /* convert on channel 1, DUAL=1 */ 31 + #define AD7887_CH_AIN0 0 /* convert on channel 0, DUAL=0,1 */ 32 + #define AD7887_PM_MODE1 0 /* CS based shutdown */ 33 + #define AD7887_PM_MODE2 1 /* full on */ 34 + #define AD7887_PM_MODE3 2 /* auto shutdown after conversion */ 35 + #define AD7887_PM_MODE4 3 /* standby mode */ 37 36 38 37 enum ad7887_channels { 39 38 AD7887_CH0, 40 39 AD7887_CH0_CH1, 41 40 AD7887_CH1, 42 41 }; 43 - 44 - #define RES_MASK(bits) ((1 << (bits)) - 1) 45 42 46 43 /** 47 44 * struct ad7887_chip_info - chip specifc information ··· 166 167 if (ret < 0) 167 168 return ret; 168 169 *val = ret >> chan->scan_type.shift; 169 - *val &= RES_MASK(chan->scan_type.realbits); 170 + *val &= GENMASK(chan->scan_type.realbits - 1, 0); 170 171 return IIO_VAL_INT; 171 172 case IIO_CHAN_INFO_SCALE: 172 173 if (st->reg) {