From 91d19ad10b5a87a8b980c6e00fb01bd4fad67371 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 28 Oct 2010 20:31:48 +0200
Subject: [PATCH] --- yaml --- r: 220496 b: refs/heads/master c:
 49c7347a44224b5b87c7e6a3c6c92619d77c06d5 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/hwmon/w83795.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 364fce0c51bb..f46cae912984 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eb8d508b5cfabbb147670ee063438469d94c465
+refs/heads/master: 49c7347a44224b5b87c7e6a3c6c92619d77c06d5
diff --git a/trunk/drivers/hwmon/w83795.c b/trunk/drivers/hwmon/w83795.c
index ec8a1d1f7d79..4e54edc415d7 100644
--- a/trunk/drivers/hwmon/w83795.c
+++ b/trunk/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;