diff options
author | Guenter Roeck <linux@roeck-us.net> | 2015-07-04 12:19:48 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2015-08-09 16:44:26 -0400 |
commit | 99b416085ce99b03b8be63d6ba8872902e9809ae (patch) | |
tree | 8cd5c0f4c6e371de3781087bfc87f9f110be35c6 /drivers/hwmon/pmbus/adm1275.c | |
parent | a07d73113febf0e17299338b9a6401955fe63b14 (diff) |
hwmon: (adm1275) Use BIT macro
Use BIT macro to simplify adding new bit masks.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/pmbus/adm1275.c')
-rw-r--r-- | drivers/hwmon/pmbus/adm1275.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c index 60aad9570f01..d34ba4f10c30 100644 --- a/drivers/hwmon/pmbus/adm1275.c +++ b/drivers/hwmon/pmbus/adm1275.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
24 | #include <linux/bitops.h> | ||
24 | #include "pmbus.h" | 25 | #include "pmbus.h" |
25 | 26 | ||
26 | enum chips { adm1075, adm1275, adm1276 }; | 27 | enum chips { adm1075, adm1275, adm1276 }; |
@@ -30,28 +31,28 @@ enum chips { adm1075, adm1275, adm1276 }; | |||
30 | #define ADM1275_PEAK_VOUT 0xd2 | 31 | #define ADM1275_PEAK_VOUT 0xd2 |
31 | #define ADM1275_PMON_CONFIG 0xd4 | 32 | #define ADM1275_PMON_CONFIG 0xd4 |
32 | 33 | ||
33 | #define ADM1275_VIN_VOUT_SELECT (1 << 6) | 34 | #define ADM1275_VIN_VOUT_SELECT BIT(6) |
34 | #define ADM1275_VRANGE (1 << 5) | 35 | #define ADM1275_VRANGE BIT(5) |
35 | #define ADM1075_IRANGE_50 (1 << 4) | 36 | #define ADM1075_IRANGE_50 BIT(4) |
36 | #define ADM1075_IRANGE_25 (1 << 3) | 37 | #define ADM1075_IRANGE_25 BIT(3) |
37 | #define ADM1075_IRANGE_MASK ((1 << 3) | (1 << 4)) | 38 | #define ADM1075_IRANGE_MASK (BIT(3) | BIT(4)) |
38 | 39 | ||
39 | #define ADM1275_IOUT_WARN2_LIMIT 0xd7 | 40 | #define ADM1275_IOUT_WARN2_LIMIT 0xd7 |
40 | #define ADM1275_DEVICE_CONFIG 0xd8 | 41 | #define ADM1275_DEVICE_CONFIG 0xd8 |
41 | 42 | ||
42 | #define ADM1275_IOUT_WARN2_SELECT (1 << 4) | 43 | #define ADM1275_IOUT_WARN2_SELECT BIT(4) |
43 | 44 | ||
44 | #define ADM1276_PEAK_PIN 0xda | 45 | #define ADM1276_PEAK_PIN 0xda |
45 | 46 | ||
46 | #define ADM1275_MFR_STATUS_IOUT_WARN2 (1 << 0) | 47 | #define ADM1275_MFR_STATUS_IOUT_WARN2 BIT(0) |
47 | 48 | ||
48 | #define ADM1075_READ_VAUX 0xdd | 49 | #define ADM1075_READ_VAUX 0xdd |
49 | #define ADM1075_VAUX_OV_WARN_LIMIT 0xde | 50 | #define ADM1075_VAUX_OV_WARN_LIMIT 0xde |
50 | #define ADM1075_VAUX_UV_WARN_LIMIT 0xdf | 51 | #define ADM1075_VAUX_UV_WARN_LIMIT 0xdf |
51 | #define ADM1075_VAUX_STATUS 0xf6 | 52 | #define ADM1075_VAUX_STATUS 0xf6 |
52 | 53 | ||
53 | #define ADM1075_VAUX_OV_WARN (1<<7) | 54 | #define ADM1075_VAUX_OV_WARN BIT(7) |
54 | #define ADM1075_VAUX_UV_WARN (1<<6) | 55 | #define ADM1075_VAUX_UV_WARN BIT(6) |
55 | 56 | ||
56 | struct adm1275_data { | 57 | struct adm1275_data { |
57 | int id; | 58 | int id; |