summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/w83795.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-10-28 20:31:48 +0200
committerJean Delvare <khali@endymion.delvare>2010-10-28 20:31:48 +0200
commit49c7347a44224b5b87c7e6a3c6c92619d77c06d5 (patch)
tree91432dbcbfd182c46a7cb89d9bece704e41eaf32 /drivers/hwmon/w83795.c
parenthwmon: (w83795) Fix parity checks (diff)
downloadlinux-49c7347a44224b5b87c7e6a3c6c92619d77c06d5.tar.xz
linux-49c7347a44224b5b87c7e6a3c6c92619d77c06d5.zip
hwmon: (w83795) Drop REST_VLT_BEGIN/END
Get rid of REST_VLT_BEGIN and REST_VLT_END, they don't make the code more readable. Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/w83795.c')
-rw-r--r--drivers/hwmon/w83795.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c
index ec8a1d1f7d79..4e54edc415d7 100644
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
@@ -175,10 +175,6 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
};
-/* 3VDD, 3VSB, VBAT * 0.006 */
-#define REST_VLT_BEGIN 12 /* the 13th volt to 15th */
-#define REST_VLT_END 14 /* the 13th volt to 15th */
-
#define W83795_REG_FAN(index) (0x2E + (index))
#define W83795_REG_FAN_MIN_HL(index) (0xB6 + (index))
#define W83795_REG_FAN_MIN_LSB(index) (0xC4 + (index) / 2)
@@ -250,7 +246,8 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
static inline u16 in_from_reg(u8 index, u16 val)
{
- if ((index >= REST_VLT_BEGIN) && (index <= REST_VLT_END))
+ /* 3VDD, 3VSB and VBAT: 6 mV/bit; other inputs: 2 mV/bit */
+ if (index >= 12 && index <= 14)
return val * 6;
else
return val * 2;
@@ -258,7 +255,7 @@ static inline u16 in_from_reg(u8 index, u16 val)
static inline u16 in_to_reg(u8 index, u16 val)
{
- if ((index >= REST_VLT_BEGIN) && (index <= REST_VLT_END))
+ if (index >= 12 && index <= 14)
return val / 6;
else
return val / 2;