diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-31 15:31:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-31 15:31:12 -0700 |
| commit | 22629b6d9072c4e86e900306d7020ad722ae6536 (patch) | |
| tree | a6c3763833f3608a76d63309dea56dab81d9fe4d /drivers/hwmon/pmbus/max34440.c | |
| parent | c8192ba416397ad6ce493f186da40767ce086c3b (diff) | |
| parent | 1ed32160dba643e61504b334f45b002198c88254 (diff) | |
Merge tag 'hwmon-for-linus-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"Notable changes:
- added support for LTM4675, LTC3886, LTC2980, LTM2987, LTC2975,
LTC3887, LTC3882, MAX20751, ADM1293, and ADM1294 to PMBus drivers
- added support for IT8732F to it87 driver
- added support for AMD Carrizo to fam15h_power driver
- added support for various new attributes to nct7802 driver
- added support for F81866 and F71868 to f71882fg driver"
* tag 'hwmon-for-linus-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (45 commits)
hwmon: (fam15h_power) Add ratio of Tsample to the PTSC period
hwmon: (fam15h_power) Add documentation for new processors support
hwmon: (fam15h_power) Update running_avg_capture bit field to 28
hwmon: (fam15h_power) Rename fam15h_power_is_internal_node0 function
hwmon: (fam15h_power) Add support for AMD Carrizo
hwmon: (ltc2978) Add support for LTM4675
hwmon: (ltc2978) Add polling for chips requiring it
hwmon: (pmbus) Enable PEC if the controller supports it
hwmon: (pmbus) Use BIT macro
hwmon: (ltc2978) Add support for LTC3886
hwmon: (ltc2978) Add support for LTC2980 and LTM2987
hwmon: (ltc2978) Add missing chip IDs for LTC2978 and LTC3882
hwmon: (ltc2978) Use correct ID mask to detect all chips
hwmon: (ltc2978) Introduce helper functions for min and max values
hwmon: (ltc2978) Introduce feature flags
hwmon: (pmbus) Convert command register definitions to enum
hwmon: (ltc2978) Add support for LTC2975
hwmon: (ltc2978) Add support for LTC3887
hwmon: (ltc2978) Add additional chip IDs for LTM4676 and LTM4676A
hwmon: (ltc2978) Add support for LTC3882
...
Diffstat (limited to 'drivers/hwmon/pmbus/max34440.c')
| -rw-r--r-- | drivers/hwmon/pmbus/max34440.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c index 7e930c3ce1ab..74a1f6f68fb3 100644 --- a/drivers/hwmon/pmbus/max34440.c +++ b/drivers/hwmon/pmbus/max34440.c @@ -19,6 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <linux/bitops.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> @@ -38,10 +39,10 @@ enum chips { max34440, max34441, max34446, max34460, max34461 }; #define MAX34446_MFR_IOUT_AVG 0xe2 #define MAX34446_MFR_TEMPERATURE_AVG 0xe3 -#define MAX34440_STATUS_OC_WARN (1 << 0) -#define MAX34440_STATUS_OC_FAULT (1 << 1) -#define MAX34440_STATUS_OT_FAULT (1 << 5) -#define MAX34440_STATUS_OT_WARN (1 << 6) +#define MAX34440_STATUS_OC_WARN BIT(0) +#define MAX34440_STATUS_OC_FAULT BIT(1) +#define MAX34440_STATUS_OT_FAULT BIT(5) +#define MAX34440_STATUS_OT_WARN BIT(6) struct max34440_data { int id; |