From c75a1c3c950d0c30cf8b14102f680b4a3dfd262c Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Sun, 22 Apr 2012 00:22:00 -0400
Subject: [PATCH] --- yaml --- r: 305858 b: refs/heads/master c:
 1137a9a649db818869905b010b120a95a01b0d24 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/hwmon/ad7314.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 819d73690e61..25ece07ce525 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bb5ee0169b80d40aa7d4854c07f1c2a90efc5b8
+refs/heads/master: 1137a9a649db818869905b010b120a95a01b0d24
diff --git a/trunk/drivers/hwmon/ad7314.c b/trunk/drivers/hwmon/ad7314.c
index f85ce70d9677..cfec802cf9ca 100644
--- a/trunk/drivers/hwmon/ad7314.c
+++ b/trunk/drivers/hwmon/ad7314.c
@@ -17,22 +17,15 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 
-/*
- * AD7314 power mode
- */
-#define AD7314_PD		0x2000
-
 /*
  * AD7314 temperature masks
  */
-#define AD7314_TEMP_SIGN		0x200
 #define AD7314_TEMP_MASK		0x7FE0
-#define AD7314_TEMP_OFFSET		5
+#define AD7314_TEMP_SHIFT		5
 
 /*
  * ADT7301 and ADT7302 temperature masks
  */
-#define ADT7301_TEMP_SIGN		0x2000
 #define ADT7301_TEMP_MASK		0x3FFF
 
 enum ad7314_variant {
@@ -73,7 +66,7 @@ static ssize_t ad7314_show_temperature(struct device *dev,
 		return ret;
 	switch (spi_get_device_id(chip->spi_dev)->driver_data) {
 	case ad7314:
-		data = (ret & AD7314_TEMP_MASK) >> AD7314_TEMP_OFFSET;
+		data = (ret & AD7314_TEMP_MASK) >> AD7314_TEMP_SHIFT;
 		data = (data << 6) >> 6;
 
 		return sprintf(buf, "%d\n", 250 * data);