From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 28 Oct 2010 18:31:46 +0000 (+0200)
Subject: hwmon: (w83795) Only create fan[1-8]_target files when needed
X-Git-Tag: v4.14-rc1~17217^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2cc528e5838d744892b30c5104bd872a439088f;p=platform%2Fkernel%2Flinux-rpi.git

hwmon: (w83795) Only create fan[1-8]_target files when needed

Only create fan[1-8]_target files when the fan in question can be
controlled (PWM output is present.) Also name these files according
to the standard.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
---

diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c
index 76e89c7bc465..00d64b0c200f 100644
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
@@ -1482,11 +1482,9 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
 	SENSOR_ATTR_2(fan##index##_div, S_IWUSR | S_IRUGO,	\
 		show_pwm, store_pwm, PWM_DIV, index - 1),	 \
 	SENSOR_ATTR_2(pwm##index##_enable, S_IWUSR | S_IRUGO,		\
-		show_pwm_enable, store_pwm_enable, NOT_USED, index - 1) }
-
-#define SENSOR_ATTR_FANIN_TARGET(index)					\
-	SENSOR_ATTR_2(speed_cruise##index##_target, S_IWUSR | S_IRUGO, \
-		show_fanin, store_fanin, FANIN_TARGET, index - 1)
+		show_pwm_enable, store_pwm_enable, NOT_USED, index - 1), \
+	SENSOR_ATTR_2(fan##index##_target, S_IWUSR | S_IRUGO, \
+		show_fanin, store_fanin, FANIN_TARGET, index - 1) }
 
 #define SENSOR_ATTR_DTS(index) {					\
 	SENSOR_ATTR_2(temp##index##_type, S_IRUGO ,		\
@@ -1632,18 +1630,7 @@ static struct sensor_device_attribute_2 w83795_dts[][8] = {
 	SENSOR_ATTR_DTS(14),
 };
 
-static struct sensor_device_attribute_2 w83795_static[] = {
-	SENSOR_ATTR_FANIN_TARGET(1),
-	SENSOR_ATTR_FANIN_TARGET(2),
-	SENSOR_ATTR_FANIN_TARGET(3),
-	SENSOR_ATTR_FANIN_TARGET(4),
-	SENSOR_ATTR_FANIN_TARGET(5),
-	SENSOR_ATTR_FANIN_TARGET(6),
-	SENSOR_ATTR_FANIN_TARGET(7),
-	SENSOR_ATTR_FANIN_TARGET(8),
-};
-
-static struct sensor_device_attribute_2 w83795_pwm[][6] = {
+static struct sensor_device_attribute_2 w83795_pwm[][7] = {
 	SENSOR_ATTR_PWM(1),
 	SENSOR_ATTR_PWM(2),
 	SENSOR_ATTR_PWM(3),
@@ -1837,12 +1824,6 @@ static int w83795_handle_files(struct device *dev, int (*fn)(struct device *,
 		}
 	}
 
-	for (i = 0; i < ARRAY_SIZE(w83795_static); i++) {
-		err = fn(dev, &w83795_static[i].dev_attr);
-		if (err)
-			return err;
-	}
-
 	return 0;
 }