projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
iio
/
meter
/
ade7854.c
diff --git
a/drivers/staging/iio/meter/ade7854.c
b/drivers/staging/iio/meter/ade7854.c
index d620bbd603a30db2264bb5f8499c142eb19a3d8c..a83883596dbcb41e73e8e494527b4a4f5c433e89 100644
(file)
--- a/
drivers/staging/iio/meter/ade7854.c
+++ b/
drivers/staging/iio/meter/ade7854.c
@@
-181,7
+181,7
@@
static int ade7854_reset(struct device *dev)
u16 val;
st->read_reg_16(dev, ADE7854_CONFIG, &val);
u16 val;
st->read_reg_16(dev, ADE7854_CONFIG, &val);
- val |=
1 << 7
; /* Software Chip Reset */
+ val |=
BIT(7)
; /* Software Chip Reset */
return st->write_reg_16(dev, ADE7854_CONFIG, val);
}
return st->write_reg_16(dev, ADE7854_CONFIG, val);
}
@@
-420,10
+420,10
@@
static int ade7854_set_irq(struct device *dev, bool enable)
goto error_ret;
if (enable)
goto error_ret;
if (enable)
- irqen |=
1 << 17
; /* 1: interrupt enabled when all periodical
+ irqen |=
BIT(17)
; /* 1: interrupt enabled when all periodical
(at 8 kHz rate) DSP computations finish. */
else
(at 8 kHz rate) DSP computations finish. */
else
- irqen &= ~
(1 <<
17);
+ irqen &= ~
BIT(
17);
ret = st->write_reg_32(dev, ADE7854_MASK0, irqen);
if (ret)
ret = st->write_reg_32(dev, ADE7854_MASK0, irqen);
if (ret)