staging: iio: Replace a bit shift by a use of BIT.
Subsystems (4)
PATCH v2 1/1 staging: iio: Replace a bit shift by a use of BIT.
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@
-1 << c
+BIT(c)
---
changes in v2
-change the cc list
drivers/staging/iio/adc/ad7816.c | 2 +- drivers/staging/iio/cdc/ad7150.c | 2 +- drivers/staging/iio/cdc/ad7746.c | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/iio/adc/ad7816.c +1 -1
@@ -222,7 +222,7 @@ static ssize_t ad7816_show_value(struct device *dev, value = (s8)((data >>AD7816_TEMP_FLOAT_OFFSET ) -103 ); data &=AD7816_TEMP_FLOAT_MASK ;if (value <0 ) - data = (1 <<AD7816_TEMP_FLOAT_OFFSET ) - data; + data = (BIT (AD7816_TEMP_FLOAT_OFFSET )) - data;return sprintf (buf,"%d.%.2d\n" , value, data *25 ); }return sprintf (buf,"%u\n" , data);
drivers/staging/iio/cdc/ad7150.c +1 -1
@@ -232,7 +232,7 @@ static int ad7150_write_event_config(struct iio_dev *indio_dev,if (ret <0 ) goto error_ret; - cfg = ret & ~((0x03 <<5 ) | (0x1 <<7 )); + cfg = ret & ~((0x03 <<5 ) | (BIT (7 )));switch (type) {case IIO_EV_TYPE_MAG_ADAPTIVE :
drivers/staging/iio/cdc/ad7746.c +11 -11
@@ -45,20 +45,20 @@#define AD7746_STATUS_RDYCAP BIT(0)/* Capacitive Channel Setup Register Bit Designations (AD7746_REG_CAP_SETUP) */ -#define AD7746_CAPSETUP_CAPEN (1 << 7) -#define AD7746_CAPSETUP_CIN2 (1 << 6)/* AD7746 only */ -#define AD7746_CAPSETUP_CAPDIFF (1 << 5) -#define AD7746_CAPSETUP_CACHOP (1 << 0) +#define AD7746_CAPSETUP_CAPEN (BIT(7)) +#define AD7746_CAPSETUP_CIN2 (BIT(6))/* AD7746 only */ +#define AD7746_CAPSETUP_CAPDIFF (BIT(5)) +#define AD7746_CAPSETUP_CACHOP (BIT(0))/* Voltage/Temperature Setup Register Bit Designations (AD7746_REG_VT_SETUP) */ -#define AD7746_VTSETUP_VTEN (1 << 7) +#define AD7746_VTSETUP_VTEN (BIT(7))#define AD7746_VTSETUP_VTMD_INT_TEMP (0 << 5) -#define AD7746_VTSETUP_VTMD_EXT_TEMP (1 << 5) +#define AD7746_VTSETUP_VTMD_EXT_TEMP (BIT(5))#define AD7746_VTSETUP_VTMD_VDD_MON (2 << 5)#define AD7746_VTSETUP_VTMD_EXT_VIN (3 << 5) -#define AD7746_VTSETUP_EXTREF (1 << 4) -#define AD7746_VTSETUP_VTSHORT (1 << 1) -#define AD7746_VTSETUP_VTCHOP (1 << 0) +#define AD7746_VTSETUP_EXTREF (BIT(4)) +#define AD7746_VTSETUP_VTSHORT (BIT(1)) +#define AD7746_VTSETUP_VTCHOP (BIT(0))/* Excitation Setup Register Bit Designations (AD7746_REG_EXC_SETUP) */ #define AD7746_EXCSETUP_CLKCTRL BIT(7)
@@ -75,14 +75,14 @@#define AD7746_CONF_VTFS_MASK GENMASK(7, 6)#define AD7746_CONF_CAPFS_MASK GENMASK(5, 3)#define AD7746_CONF_MODE_IDLE (0 << 0) -#define AD7746_CONF_MODE_CONT_CONV (1 << 0) +#define AD7746_CONF_MODE_CONT_CONV (BIT(0))#define AD7746_CONF_MODE_SINGLE_CONV (2 << 0)#define AD7746_CONF_MODE_PWRDN (3 << 0)#define AD7746_CONF_MODE_OFFS_CAL (5 << 0)#define AD7746_CONF_MODE_GAIN_CAL (6 << 0)/* CAPDAC Register Bit Designations (AD7746_REG_CAPDACx) */ -#define AD7746_CAPDAC_DACEN (1 << 7) +#define AD7746_CAPDAC_DACEN (BIT(7))#define AD7746_CAPDAC_DACP (x) ((x) & 0x7F)/*
Signature · 1 line
2.11.0
Quoted 8 lines · Arushi Singhal
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@-1 << c
+BIT(c)
When it comes to doing this type of conversion semantics, i.e. the meaning of the value, are important. The BIT() macro should only be used when the value is really a 1 bit value. Otherwise it will be confusing to the reader of the code.
Also one patch per driver please (Unless it is an absolutely identical change to multiple driver, not just the same class of change).
Quoted 16 lines
Signed-off-by Arushi Singhal <[email protected]>---
changes in v2
-change the cc listdrivers/staging/iio/adc/ad7816.c | 2 +- drivers/staging/iio/cdc/ad7150.c | 2 +- drivers/staging/iio/cdc/ad7746.c | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-)drivers/staging/iio/adc/ad7816.c +0
-0
drivers/staging/iio/adc/ad7816.c static ssize_t ad7816_show_value(struct device *dev, · line 225
Quoted 5 lines
drivers/staging/iio/adc/ad7816.c +1
-1@@ -222,7 +222,7 @@ static ssize_t ad7816_show_value(struct device *dev, value = (s8)((data >>AD7816_TEMP_FLOAT_OFFSET ) -103 ); data &=AD7816_TEMP_FLOAT_MASK ;if (value <0 ) - data = (1 <<AD7816_TEMP_FLOAT_OFFSET ) - data; + data = (BIT (AD7816_TEMP_FLOAT_OFFSET )) - data;
This for example is just a really poor implementation of unsigned binary to signed conversion (The formula I think is straight from the datasheet). Semantically talking about a 1-bit value here makes no sense. What the code does is to construct a value that is equal to 2**AD7816_TEMP_FLOAT_OFFSET.
drivers/staging/iio/cdc/ad7150.c static int ad7150_write_event_config(struct iio_dev *indio_dev, · line 235
Quoted 13 lines
drivers/staging/iio/adc/ad7816.c +0
-0return sprintf (buf,"%d.%.2d\n" , value, data *25 ); }return sprintf (buf,"%u\n" , data);drivers/staging/iio/cdc/ad7150.c +1
-1@@ -232,7 +232,7 @@ static int ad7150_write_event_config(struct iio_dev *indio_dev,if (ret <0 ) goto error_ret; - cfg = ret & ~((0x03 <<5 ) | (0x1 <<7 )); + cfg = ret & ~((0x03 <<5 ) | (BIT (7 )));
This is OK. It's a one bit field that is set here.
Quoted 9 lines
drivers/staging/iio/cdc/ad7150.c +0
-0switch (type) {case IIO_EV_TYPE_MAG_ADAPTIVE :drivers/staging/iio/cdc/ad7746.c +0
-0@@ -45,20 +45,20 @@#define AD7746_STATUS_RDYCAP BIT(0)
drivers/staging/iio/cdc/ad7746.c line 51
Quoted 10 lines
drivers/staging/iio/cdc/ad7746.c +4
-4/* Capacitive Channel Setup Register Bit Designations (AD7746_REG_CAP_SETUP) */ -#define AD7746_CAPSETUP_CAPEN (1 << 7) -#define AD7746_CAPSETUP_CIN2 (1 << 6)/* AD7746 only */ -#define AD7746_CAPSETUP_CAPDIFF (1 << 5) -#define AD7746_CAPSETUP_CACHOP (1 << 0) +#define AD7746_CAPSETUP_CAPEN (BIT(7)) +#define AD7746_CAPSETUP_CIN2 (BIT(6))/* AD7746 only */ +#define AD7746_CAPSETUP_CAPDIFF (BIT(5)) +#define AD7746_CAPSETUP_CACHOP (BIT(0))
These are all OK, they are single bit values or flags.
drivers/staging/iio/cdc/ad7746.c line 56
Quoted 7 lines
drivers/staging/iio/cdc/ad7746.c +2
-2/* Voltage/Temperature Setup Register Bit Designations (AD7746_REG_VT_SETUP) */ -#define AD7746_VTSETUP_VTEN (1 << 7) +#define AD7746_VTSETUP_VTEN (BIT(7))#define AD7746_VTSETUP_VTMD_INT_TEMP (0 << 5) -#define AD7746_VTSETUP_VTMD_EXT_TEMP (1 << 5) +#define AD7746_VTSETUP_VTMD_EXT_TEMP (BIT(5))
This is not OK. This is a multi-bit field. b01 just happens to be one of the valid values.
drivers/staging/iio/cdc/ad7746.c line 61
Quoted 8 lines
drivers/staging/iio/cdc/ad7746.c +3
-3#define AD7746_VTSETUP_VTMD_VDD_MON (2 << 5)#define AD7746_VTSETUP_VTMD_EXT_VIN (3 << 5) -#define AD7746_VTSETUP_EXTREF (1 << 4) -#define AD7746_VTSETUP_VTSHORT (1 << 1) -#define AD7746_VTSETUP_VTCHOP (1 << 0) +#define AD7746_VTSETUP_EXTREF (BIT(4)) +#define AD7746_VTSETUP_VTSHORT (BIT(1)) +#define AD7746_VTSETUP_VTCHOP (BIT(0))
These are OK. All single bit values.
drivers/staging/iio/cdc/ad7746.c line 78
Quoted 9 lines
drivers/staging/iio/cdc/ad7746.c +1
-1/* Excitation Setup Register Bit Designations (AD7746_REG_EXC_SETUP) */ #define AD7746_EXCSETUP_CLKCTRL BIT(7)@@ -75,14 +75,14 @@#define AD7746_CONF_VTFS_MASK GENMASK(7, 6)#define AD7746_CONF_CAPFS_MASK GENMASK(5, 3)#define AD7746_CONF_MODE_IDLE (0 << 0) -#define AD7746_CONF_MODE_CONT_CONV (1 << 0) +#define AD7746_CONF_MODE_CONT_CONV (BIT(0))
This again is a multi-bit field where 1 is one of the possible values. So not OK.
drivers/staging/iio/cdc/ad7746.c line 85
Quoted 8 lines
drivers/staging/iio/cdc/ad7746.c +1
-1#define AD7746_CONF_MODE_SINGLE_CONV (2 << 0)#define AD7746_CONF_MODE_PWRDN (3 << 0)#define AD7746_CONF_MODE_OFFS_CAL (5 << 0)#define AD7746_CONF_MODE_GAIN_CAL (6 << 0)/* CAPDAC Register Bit Designations (AD7746_REG_CAPDACx) */ -#define AD7746_CAPDAC_DACEN (1 << 7) +#define AD7746_CAPDAC_DACEN (BIT(7))
OK.
Quoted 4 lines
drivers/staging/iio/cdc/ad7746.c +0
-0#define AD7746_CAPDAC_DACP (x) ((x) & 0x7F)/*