From 3e799828e3fe6acde0ae80ea0bc680d5236009d9 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Tue, 11 Sep 2012 13:34:29 -0700
Subject: [PATCH] --- yaml --- r: 326207 b: refs/heads/master c:
 860f37319e9a1141b041ca2e77ca121dccde4b93 h: refs/heads/master i:   326205:
 1eed3a719725123e0ac51a2a1a27fde0cf3fdb86   326203:
 73a6ea20191f42c9ce60e922873743ebeadfcc3a   326199:
 4f048cd65d530b1dbd82733ac864d8241adf9cf6   326191:
 a58beec39497ce9d5f0712abb9d9330c61863a36   326175:
 75152c3e0cd0469c2005f69215933d800a3b1d29   326143:
 789f8720fc74c8e8d7bf101a5578e7b3b25b336c v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/hwmon/lm70.c | 21 +--------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 8f27672fc330..c67e2d793108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc00e4ddbf00d5ee6d8b7df6d4b04d98f3d99af5
+refs/heads/master: 860f37319e9a1141b041ca2e77ca121dccde4b93
diff --git a/trunk/drivers/hwmon/lm70.c b/trunk/drivers/hwmon/lm70.c
index 789753d0df79..2d1777a03edb 100644
--- a/trunk/drivers/hwmon/lm70.c
+++ b/trunk/drivers/hwmon/lm70.c
@@ -124,26 +124,7 @@ static DEVICE_ATTR(temp1_input, S_IRUGO, lm70_sense_temp, NULL);
 static ssize_t lm70_show_name(struct device *dev, struct device_attribute
 			      *devattr, char *buf)
 {
-	struct lm70 *p_lm70 = dev_get_drvdata(dev);
-	int ret;
-
-	switch (p_lm70->chip) {
-	case LM70_CHIP_LM70:
-		ret = sprintf(buf, "lm70\n");
-		break;
-	case LM70_CHIP_TMP121:
-		ret = sprintf(buf, "tmp121\n");
-		break;
-	case LM70_CHIP_LM71:
-		ret = sprintf(buf, "lm71\n");
-		break;
-	case LM70_CHIP_LM74:
-		ret = sprintf(buf, "lm74\n");
-		break;
-	default:
-		ret = -EINVAL;
-	}
-	return ret;
+	return sprintf(buf, "%s\n", to_spi_device(dev)->modalias);
 }
 
 static DEVICE_ATTR(name, S_IRUGO, lm70_show_name, NULL);