diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2013-03-27 16:48:03 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2013-04-14 13:46:56 +0200 |
| commit | 947e92719db4163da6985afcc9ed3cf4147adbd4 (patch) | |
| tree | 3c739c44cf75228398f2da5c237220011890df70 /drivers/hwmon | |
| parent | hwmon: (nct6775) Use ARRAY_SIZE for loops where possible (diff) | |
| download | linux-947e92719db4163da6985afcc9ed3cf4147adbd4.tar.xz linux-947e92719db4163da6985afcc9ed3cf4147adbd4.zip | |
hwmon: (tmp401) Drop unused defines, use BIT for bit masks
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/tmp401.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c index be71a3e17cca..04cf0c63a2ea 100644 --- a/drivers/hwmon/tmp401.c +++ b/drivers/hwmon/tmp401.c @@ -30,6 +30,7 @@ #include <linux/module.h> #include <linux/init.h> +#include <linux/bitops.h> #include <linux/slab.h> #include <linux/jiffies.h> #include <linux/i2c.h> @@ -54,10 +55,8 @@ enum chips { tmp401, tmp411, tmp431 }; #define TMP401_CONVERSION_RATE_READ 0x04 #define TMP401_CONVERSION_RATE_WRITE 0x0A #define TMP401_TEMP_CRIT_HYST 0x21 -#define TMP401_CONSECUTIVE_ALERT 0x22 #define TMP401_MANUFACTURER_ID_REG 0xFE #define TMP401_DEVICE_ID_REG 0xFF -#define TMP411_N_FACTOR_REG 0x18 static const u8 TMP401_TEMP_MSB[2] = { 0x00, 0x01 }; static const u8 TMP401_TEMP_LSB[2] = { 0x15, 0x10 }; @@ -76,15 +75,15 @@ static const u8 TMP411_TEMP_HIGHEST_MSB[2] = { 0x32, 0x36 }; static const u8 TMP411_TEMP_HIGHEST_LSB[2] = { 0x33, 0x37 }; /* Flags */ -#define TMP401_CONFIG_RANGE 0x04 -#define TMP401_CONFIG_SHUTDOWN 0x40 -#define TMP401_STATUS_LOCAL_CRIT 0x01 -#define TMP401_STATUS_REMOTE_CRIT 0x02 -#define TMP401_STATUS_REMOTE_OPEN 0x04 -#define TMP401_STATUS_REMOTE_LOW 0x08 -#define TMP401_STATUS_REMOTE_HIGH 0x10 -#define TMP401_STATUS_LOCAL_LOW 0x20 -#define TMP401_STATUS_LOCAL_HIGH 0x40 +#define TMP401_CONFIG_RANGE BIT(2) +#define TMP401_CONFIG_SHUTDOWN BIT(6) +#define TMP401_STATUS_LOCAL_CRIT BIT(0) +#define TMP401_STATUS_REMOTE_CRIT BIT(1) +#define TMP401_STATUS_REMOTE_OPEN BIT(2) +#define TMP401_STATUS_REMOTE_LOW BIT(3) +#define TMP401_STATUS_REMOTE_HIGH BIT(4) +#define TMP401_STATUS_LOCAL_LOW BIT(5) +#define TMP401_STATUS_LOCAL_HIGH BIT(6) /* Manufacturer / Device ID's */ #define TMP401_MANUFACTURER_ID 0x55 |