niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Staging: iio: adc: ad7280a.c: Fixed Macro argument reuse

Browse source 
CHECK: Macro argument reuse 'addr' - possible side-effects?

convert AD7280A_DEVADDR to ad7280a_devaddr static function
to fix checkpath check

v3: small style changes

Signed-off-by: Jaya Durga <rjdurga@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Jaya Durga 2017-07-19 17:55:57 +05:30 • committed by Jonathan Cameron
parent ebbb333ae2
commit 065a7c0b1f
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/iio/adc/ad7280a.c
View file

@ -99,9 +99,14 @@
#define AD7280A_DEVADDR_MASTER 0 #define AD7280A_DEVADDR_MASTER 0
#define AD7280A_DEVADDR_ALL 0x1F #define AD7280A_DEVADDR_ALL 0x1F
/* 5-bit device address is sent LSB first */ /* 5-bit device address is sent LSB first */
#define AD7280A_DEVADDR(addr) (((addr & 0x1) << 4) | ((addr & 0x2) << 3) | \ static unsigned int ad7280a_devaddr(unsigned int addr)
(addr & 0x4) | ((addr & 0x8) >> 3) | \ {
((addr & 0x10) >> 4)) return ((addr & 0x1) << 4) |
((addr & 0x2) << 3) |
(addr & 0x4) |
((addr & 0x8) >> 3) |
((addr & 0x10) >> 4);
}
/* During a read a valid write is mandatory. /* During a read a valid write is mandatory.
* So writing to the highest available address (Address 0x1F) * So writing to the highest available address (Address 0x1F)
@ -372,7 +377,7 @@ static int ad7280_chain_setup(struct ad7280_state *st)
if (ad7280_check_crc(st, val)) if (ad7280_check_crc(st, val))
return -EIO; return -EIO;
if (n != AD7280A_DEVADDR(val >> 27)) if (n != ad7280a_devaddr(val >> 27))
return -EIO; return -EIO;
} }
@ -511,7 +516,7 @@ static int ad7280_channel_init(struct ad7280_state *st)
st->channels[cnt].info_mask_shared_by_type = st->channels[cnt].info_mask_shared_by_type =
BIT(IIO_CHAN_INFO_SCALE); BIT(IIO_CHAN_INFO_SCALE);
st->channels[cnt].address = st->channels[cnt].address =
AD7280A_DEVADDR(dev) << 8 | ch; ad7280a_devaddr(dev) << 8 | ch;
st->channels[cnt].scan_index = cnt; st->channels[cnt].scan_index = cnt;
st->channels[cnt].scan_type.sign = 'u'; st->channels[cnt].scan_type.sign = 'u';
st->channels[cnt].scan_type.realbits = 12; st->channels[cnt].scan_type.realbits = 12;
@ -558,7 +563,7 @@ static int ad7280_attr_init(struct ad7280_state *st)
for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_CELL_VOLTAGE_6; for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_CELL_VOLTAGE_6;
ch++, cnt++) { ch++, cnt++) {
st->iio_attr[cnt].address = st->iio_attr[cnt].address =
AD7280A_DEVADDR(dev) << 8 | ch; ad7280a_devaddr(dev) << 8 | ch;
st->iio_attr[cnt].dev_attr.attr.mode = st->iio_attr[cnt].dev_attr.attr.mode =
0644; 0644;
st->iio_attr[cnt].dev_attr.show = st->iio_attr[cnt].dev_attr.show =
@ -574,7 +579,7 @@ static int ad7280_attr_init(struct ad7280_state *st)
&st->iio_attr[cnt].dev_attr.attr; &st->iio_attr[cnt].dev_attr.attr;
cnt++; cnt++;
st->iio_attr[cnt].address = st->iio_attr[cnt].address =
AD7280A_DEVADDR(dev) << 8 | ad7280a_devaddr(dev) << 8 |
(AD7280A_CB1_TIMER + ch); (AD7280A_CB1_TIMER + ch);
st->iio_attr[cnt].dev_attr.attr.mode = st->iio_attr[cnt].dev_attr.attr.mode =
0644; 0644;
@ -918,7 +923,7 @@ static int ad7280_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unregister; goto error_unregister;
ret = ad7280_write(st, AD7280A_DEVADDR(st->slave_num), ret = ad7280_write(st, ad7280a_devaddr(st->slave_num),
AD7280A_ALERT, 0, AD7280A_ALERT, 0,
AD7280A_ALERT_GEN_STATIC_HIGH | AD7280A_ALERT_GEN_STATIC_HIGH |
(pdata->chain_last_alert_ignore & 0xF)); (pdata->chain_last_alert_ignore & 0xF));