diff options
author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-12-06 01:00:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-06-14 10:48:24 -0400 |
commit | a476bc02eb4365d02ac71f20b5034e2437691e3f (patch) | |
tree | e1336d495290a18c4f85614cd363682f8455b3db | |
parent | ff96bf519acdb3b99f9bfe07667a9020d5015395 (diff) |
iio:adc:ad5504: 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>
-rw-r--r-- | drivers/iio/dac/ad5504.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 1e6449346b50..c917dd24090a 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c | |||
@@ -15,17 +15,16 @@ | |||
15 | #include <linux/sysfs.h> | 15 | #include <linux/sysfs.h> |
16 | #include <linux/regulator/consumer.h> | 16 | #include <linux/regulator/consumer.h> |
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/bitops.h> | ||
18 | 19 | ||
19 | #include <linux/iio/iio.h> | 20 | #include <linux/iio/iio.h> |
20 | #include <linux/iio/sysfs.h> | 21 | #include <linux/iio/sysfs.h> |
21 | #include <linux/iio/events.h> | 22 | #include <linux/iio/events.h> |
22 | #include <linux/iio/dac/ad5504.h> | 23 | #include <linux/iio/dac/ad5504.h> |
23 | 24 | ||
24 | #define AD5505_BITS 12 | 25 | #define AD5504_RES_MASK GENMASK(11, 0) |
25 | #define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1) | 26 | #define AD5504_CMD_READ BIT(15) |
26 | 27 | #define AD5504_CMD_WRITE 0 | |
27 | #define AD5504_CMD_READ (1 << 15) | ||
28 | #define AD5504_CMD_WRITE (0 << 15) | ||
29 | #define AD5504_ADDR(addr) ((addr) << 12) | 28 | #define AD5504_ADDR(addr) ((addr) << 12) |
30 | 29 | ||
31 | /* Registers */ | 30 | /* Registers */ |
@@ -42,7 +41,7 @@ | |||
42 | 41 | ||
43 | /** | 42 | /** |
44 | * struct ad5446_state - driver instance specific data | 43 | * struct ad5446_state - driver instance specific data |
45 | * @us: spi_device | 44 | * @spi: spi_device |
46 | * @reg: supply regulator | 45 | * @reg: supply regulator |
47 | * @vref_mv: actual reference voltage used | 46 | * @vref_mv: actual reference voltage used |
48 | * @pwr_down_mask power down mask | 47 | * @pwr_down_mask power down mask |