hwmon: (tmp401) Drop unused defines, use BIT for bit masks
authorGuenter Roeck <linux@roeck-us.net>
Wed, 27 Mar 2013 15:48:03 +0000 (08:48 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 14 Apr 2013 11:46:56 +0000 (04:46 -0700)
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
drivers/hwmon/tmp401.c

index be71a3e17ccad503e87586318f846d39ae2eaf7c..04cf0c63a2ea8c4bacb031ab7027ddce9f38badf 100644 (file)
@@ -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