[PATCH] hwmon: Use attribute arrays in f71805f

Convert the f71805f driver to use arrays of attributes. This shrinks the
compiled module from 12.0 kB to 9.6 kB. We certainly should do the same
for as many hardware monitoring drivers as possible.

This, together with a nice chip design by Fintek, makes this driver
very small, both in terms of number of lines of code and memory
consumption.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index e029e0a94eccc0e447cd86766498189648dd7ba5..8e810f05d0aecc73772c32a5c894fb9045efcaa9 100644 (file)
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -384,10 +384,6 @@ static ssize_t set_in0_min(struct device *dev, struct device_attribute
        return count;
 }
 
-static DEVICE_ATTR(in0_input, S_IRUGO, show_in0, NULL);
-static DEVICE_ATTR(in0_max, S_IRUGO| S_IWUSR, show_in0_max, set_in0_max);
-static DEVICE_ATTR(in0_min, S_IRUGO| S_IWUSR, show_in0_min, set_in0_min);
-
 static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
                       char *buf)
 {
@@ -450,23 +446,6 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute
        return count;
 }
 
-#define sysfs_in(offset)                                       \
-static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,         \
-               show_in, NULL, offset);                         \
-static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
-               show_in_max, set_in_max, offset);               \
-static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
-               show_in_min, set_in_min, offset)
-
-sysfs_in(1);
-sysfs_in(2);
-sysfs_in(3);
-sysfs_in(4);
-sysfs_in(5);
-sysfs_in(6);
-sysfs_in(7);
-sysfs_in(8);
-
 static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
                        char *buf)
 {
@@ -503,16 +482,6 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute
        return count;
 }
 
-#define sysfs_fan(offset)                                      \
-static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,                \
-               show_fan, NULL, offset - 1);                    \
-static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,        \
-               show_fan_min, set_fan_min, offset - 1)
-
-sysfs_fan(1);
-sysfs_fan(2);
-sysfs_fan(3);
-
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                         char *buf)
 {
@@ -586,20 +555,6 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute
        return count;
 }
 
-#define sysfs_temp(offset)                                             \
-static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,               \
-               show_temp, NULL, offset - 1);                           \
-static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,       \
-               show_temp_max, set_temp_max, offset - 1);               \
-static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,  \
-               show_temp_hyst, set_temp_hyst, offset - 1);             \
-static SENSOR_DEVICE_ATTR(temp##offset##_type, S_IRUGO,                        \
-               show_temp_type, NULL, offset - 1)
-
-sysfs_temp(1);
-sysfs_temp(2);
-sysfs_temp(3);
-
 static ssize_t show_alarms_in(struct device *dev, struct device_attribute
                              *devattr, char *buf)
 {
@@ -625,10 +580,6 @@ static ssize_t show_alarms_temp(struct device *dev, struct device_attribute
        return sprintf(buf, "%d\n", (data->alarms[1] >> 3) & 0x07);
 }
 
-static DEVICE_ATTR(alarms_in, S_IRUGO, show_alarms_in, NULL);
-static DEVICE_ATTR(alarms_fan, S_IRUGO, show_alarms_fan, NULL);
-static DEVICE_ATTR(alarms_temp, S_IRUGO, show_alarms_temp, NULL);
-
 static ssize_t show_name(struct device *dev, struct device_attribute
                         *devattr, char *buf)
 {
@@ -637,7 +588,89 @@ static ssize_t show_name(struct device *dev, struct device_attribute
        return sprintf(buf, "%s\n", data->name);
 }
 
-static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+static struct device_attribute f71805f_dev_attr[] = {
+       __ATTR(in0_input, S_IRUGO, show_in0, NULL),
+       __ATTR(in0_max, S_IRUGO| S_IWUSR, show_in0_max, set_in0_max),
+       __ATTR(in0_min, S_IRUGO| S_IWUSR, show_in0_min, set_in0_min),
+       __ATTR(alarms_in, S_IRUGO, show_alarms_in, NULL),
+       __ATTR(alarms_fan, S_IRUGO, show_alarms_fan, NULL),
+       __ATTR(alarms_temp, S_IRUGO, show_alarms_temp, NULL),
+       __ATTR(name, S_IRUGO, show_name, NULL),
+};
+
+static struct sensor_device_attribute f71805f_sensor_attr[] = {
+       SENSOR_ATTR(in1_input, S_IRUGO, show_in, NULL, 1),
+       SENSOR_ATTR(in1_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 1),
+       SENSOR_ATTR(in1_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 1),
+       SENSOR_ATTR(in2_input, S_IRUGO, show_in, NULL, 2),
+       SENSOR_ATTR(in2_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 2),
+       SENSOR_ATTR(in2_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 2),
+       SENSOR_ATTR(in3_input, S_IRUGO, show_in, NULL, 3),
+       SENSOR_ATTR(in3_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 3),
+       SENSOR_ATTR(in3_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 3),
+       SENSOR_ATTR(in4_input, S_IRUGO, show_in, NULL, 4),
+       SENSOR_ATTR(in4_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 4),
+       SENSOR_ATTR(in4_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 4),
+       SENSOR_ATTR(in5_input, S_IRUGO, show_in, NULL, 5),
+       SENSOR_ATTR(in5_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 5),
+       SENSOR_ATTR(in5_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 5),
+       SENSOR_ATTR(in6_input, S_IRUGO, show_in, NULL, 6),
+       SENSOR_ATTR(in6_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 6),
+       SENSOR_ATTR(in6_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 6),
+       SENSOR_ATTR(in7_input, S_IRUGO, show_in, NULL, 7),
+       SENSOR_ATTR(in7_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 7),
+       SENSOR_ATTR(in7_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 7),
+       SENSOR_ATTR(in8_input, S_IRUGO, show_in, NULL, 8),
+       SENSOR_ATTR(in8_max, S_IRUGO | S_IWUSR,
+                   show_in_max, set_in_max, 8),
+       SENSOR_ATTR(in8_min, S_IRUGO | S_IWUSR,
+                   show_in_min, set_in_min, 8),
+
+       SENSOR_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0),
+       SENSOR_ATTR(temp1_max, S_IRUGO | S_IWUSR,
+                   show_temp_max, set_temp_max, 0),
+       SENSOR_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR,
+                   show_temp_hyst, set_temp_hyst, 0),
+       SENSOR_ATTR(temp1_type, S_IRUGO, show_temp_type, NULL, 0),
+       SENSOR_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1),
+       SENSOR_ATTR(temp2_max, S_IRUGO | S_IWUSR,
+                   show_temp_max, set_temp_max, 1),
+       SENSOR_ATTR(temp2_max_hyst, S_IRUGO | S_IWUSR,
+                   show_temp_hyst, set_temp_hyst, 1),
+       SENSOR_ATTR(temp2_type, S_IRUGO, show_temp_type, NULL, 1),
+       SENSOR_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2),
+       SENSOR_ATTR(temp3_max, S_IRUGO | S_IWUSR,
+                   show_temp_max, set_temp_max, 2),
+       SENSOR_ATTR(temp3_max_hyst, S_IRUGO | S_IWUSR,
+                   show_temp_hyst, set_temp_hyst, 2),
+       SENSOR_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2),
+};
+
+static struct sensor_device_attribute f71805f_fan_attr[] = {
+       SENSOR_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0),
+       SENSOR_ATTR(fan1_min, S_IRUGO | S_IWUSR,
+                   show_fan_min, set_fan_min, 0),
+       SENSOR_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1),
+       SENSOR_ATTR(fan2_min, S_IRUGO | S_IWUSR,
+                   show_fan_min, set_fan_min, 1),
+       SENSOR_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2),
+       SENSOR_ATTR(fan3_min, S_IRUGO | S_IWUSR,
+                   show_fan_min, set_fan_min, 2),
+};
 
 /*
  * Device registration and initialization
@@ -668,7 +701,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
 {
        struct f71805f_data *data;
        struct resource *res;
-       int err;
+       int i, err;
 
        if (!(data = kzalloc(sizeof(struct f71805f_data), GFP_KERNEL))) {
                err = -ENOMEM;
@@ -695,76 +728,31 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
        f71805f_init_device(data);
 
        /* Register sysfs interface files */
-       device_create_file(&pdev->dev, &dev_attr_in0_input);
-       device_create_file(&pdev->dev, &dev_attr_in0_max);
-       device_create_file(&pdev->dev, &dev_attr_in0_min);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in1_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in2_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in3_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in4_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in5_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in6_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in7_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in8_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in1_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in2_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in3_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in4_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in5_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in6_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in7_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in8_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in1_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in2_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in3_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in4_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in5_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in6_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in7_min.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_in8_min.dev_attr);
-       if (data->fan_enabled & (1 << 0)) {
-               device_create_file(&pdev->dev,
-                                  &sensor_dev_attr_fan1_input.dev_attr);
-               device_create_file(&pdev->dev,
-                                  &sensor_dev_attr_fan1_min.dev_attr);
+       for (i = 0; i < ARRAY_SIZE(f71805f_dev_attr); i++) {
+               err = device_create_file(&pdev->dev, &f71805f_dev_attr[i]);
+               if (err)
+                       goto exit_class;
        }
-       if (data->fan_enabled & (1 << 1)) {
-               device_create_file(&pdev->dev,
-                                  &sensor_dev_attr_fan2_input.dev_attr);
-               device_create_file(&pdev->dev,
-                                  &sensor_dev_attr_fan2_min.dev_attr);
+       for (i = 0; i < ARRAY_SIZE(f71805f_sensor_attr); i++) {
+               err = device_create_file(&pdev->dev,
+                                        &f71805f_sensor_attr[i].dev_attr);
+               if (err)
+                       goto exit_class;
        }
-       if (data->fan_enabled & (1 << 2)) {
-               device_create_file(&pdev->dev,
-                                  &sensor_dev_attr_fan3_input.dev_attr);
-               device_create_file(&pdev->dev,
-                                  &sensor_dev_attr_fan3_min.dev_attr);
+       for (i = 0; i < ARRAY_SIZE(f71805f_fan_attr); i++) {
+               if (!(data->fan_enabled & (1 << (i / 2))))
+                       continue;
+               err = device_create_file(&pdev->dev,
+                                        &f71805f_fan_attr[i].dev_attr);
+               if (err)
+                       goto exit_class;
        }
-       device_create_file(&pdev->dev,
-                          &sensor_dev_attr_temp1_input.dev_attr);
-       device_create_file(&pdev->dev,
-                          &sensor_dev_attr_temp2_input.dev_attr);
-       device_create_file(&pdev->dev,
-                          &sensor_dev_attr_temp3_input.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_temp2_max.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_temp3_max.dev_attr);
-       device_create_file(&pdev->dev,
-                          &sensor_dev_attr_temp1_max_hyst.dev_attr);
-       device_create_file(&pdev->dev,
-                          &sensor_dev_attr_temp2_max_hyst.dev_attr);
-       device_create_file(&pdev->dev,
-                          &sensor_dev_attr_temp3_max_hyst.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_temp1_type.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_temp2_type.dev_attr);
-       device_create_file(&pdev->dev, &sensor_dev_attr_temp3_type.dev_attr);
-       device_create_file(&pdev->dev, &dev_attr_alarms_in);
-       device_create_file(&pdev->dev, &dev_attr_alarms_fan);
-       device_create_file(&pdev->dev, &dev_attr_alarms_temp);
-       device_create_file(&pdev->dev, &dev_attr_name);
 
        return 0;
 
+exit_class:
+       dev_err(&pdev->dev, "Sysfs interface creation failed\n");
+       hwmon_device_unregister(data->class_dev);
 exit_free:
        kfree(data);
 exit: