1 files changed, 132 insertions, 143 deletions

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index e029e0a94ecc..885465df6e6a 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -30,6 +30,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 
 static struct platform_device *pdev;
@@ -131,10 +132,10 @@ static struct resource f71805f_resource __initdata = {
 struct f71805f_data {
         unsigned short addr;
         const char *name;
-        struct semaphore lock;
+        struct mutex lock;
         struct class_device *class_dev;
 
-        struct semaphore update_lock;
+        struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
         unsigned long last_limits;      /* In jiffies */
@@ -224,20 +225,20 @@ static u8 f71805f_read8(struct f71805f_data *data, u8 reg)
 {
         u8 val;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb(reg, data->addr + ADDR_REG_OFFSET);
         val = inb(data->addr + DATA_REG_OFFSET);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 
         return val;
 }
 
 static void f71805f_write8(struct f71805f_data *data, u8 reg, u8 val)
 {
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb(reg, data->addr + ADDR_REG_OFFSET);
         outb(val, data->addr + DATA_REG_OFFSET);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 }
 
 /* It is important to read the MSB first, because doing so latches the
@@ -246,24 +247,24 @@ static u16 f71805f_read16(struct f71805f_data *data, u8 reg)
 {
         u16 val;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb(reg, data->addr + ADDR_REG_OFFSET);
         val = inb(data->addr + DATA_REG_OFFSET) << 8;
         outb(++reg, data->addr + ADDR_REG_OFFSET);
         val |= inb(data->addr + DATA_REG_OFFSET);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 
         return val;
 }
 
 static void f71805f_write16(struct f71805f_data *data, u8 reg, u16 val)
 {
-        down(&data->lock);
+        mutex_lock(&data->lock);
         outb(reg, data->addr + ADDR_REG_OFFSET);
         outb(val >> 8, data->addr + DATA_REG_OFFSET);
         outb(++reg, data->addr + ADDR_REG_OFFSET);
         outb(val & 0xff, data->addr + DATA_REG_OFFSET);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 }
 
 static struct f71805f_data *f71805f_update_device(struct device *dev)
@@ -271,7 +272,7 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
         struct f71805f_data *data = dev_get_drvdata(dev);
         int nr;
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
 
         /* Limit registers cache is refreshed after 60 seconds */
         if (time_after(jiffies, data->last_updated + 60 * HZ)
@@ -323,7 +324,7 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
                 data->valid = 1;
         }
 
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return data;
 }
@@ -362,10 +363,10 @@ static ssize_t set_in0_max(struct device *dev, struct device_attribute
         struct f71805f_data *data = dev_get_drvdata(dev);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_high[0] = in0_to_reg(val);
         f71805f_write8(data, F71805F_REG_IN_HIGH(0), data->in_high[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -376,18 +377,14 @@ static ssize_t set_in0_min(struct device *dev, struct device_attribute
         struct f71805f_data *data = dev_get_drvdata(dev);
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_low[0] = in0_to_reg(val);
         f71805f_write8(data, F71805F_REG_IN_LOW(0), data->in_low[0]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         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)
 {
@@ -426,10 +423,10 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute
         int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_high[nr] = in_to_reg(val);
         f71805f_write8(data, F71805F_REG_IN_HIGH(nr), data->in_high[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -442,31 +439,14 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute
         int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->in_low[nr] = in_to_reg(val);
         f71805f_write8(data, F71805F_REG_IN_LOW(nr), data->in_low[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         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)
 {
@@ -495,24 +475,14 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute
         int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->fan_low[nr] = fan_to_reg(val);
         f71805f_write16(data, F71805F_REG_FAN_LOW(nr), data->fan_low[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         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)
 {
@@ -562,10 +532,10 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute
         int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_high[nr] = temp_to_reg(val);
         f71805f_write8(data, F71805F_REG_TEMP_HIGH(nr), data->temp_high[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         return count;
 }
@@ -578,28 +548,14 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute
         int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
-        down(&data->update_lock);
+        mutex_lock(&data->update_lock);
         data->temp_hyst[nr] = temp_to_reg(val);
         f71805f_write8(data, F71805F_REG_TEMP_HYST(nr), data->temp_hyst[nr]);
-        up(&data->update_lock);
+        mutex_unlock(&data->update_lock);
 
         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 +581,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 +589,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 +702,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;
@@ -678,9 +712,9 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
         data->addr = res->start;
-        init_MUTEX(&data->lock);
+        mutex_init(&data->lock);
         data->name = "f71805f";
-        init_MUTEX(&data->update_lock);
+        mutex_init(&data->update_lock);
 
         platform_set_drvdata(pdev, data);
 
@@ -695,76 +729,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: