[PATCH] WAN: update info page for a bunch of my drivers

[linux-2.6] / drivers / hwmon / f71805f.c

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 8e810f05d0aecc73772c32a5c894fb9045efcaa9..fd72440faf76167e08a22d9409255a70c4dba256 100644 (file)
--- 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;
@@ -98,10 +99,6 @@ superio_exit(int base)
 #define ADDR_REG_OFFSET                0
 #define DATA_REG_OFFSET                1
 
-static struct resource f71805f_resource __initdata = {
-       .flags  = IORESOURCE_IO,
-};
-
 /*
  * Registers
  */
@@ -131,10 +128,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 +221,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 +243,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 +268,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 +320,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 +359,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,10 +373,10 @@ 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;
 }
@@ -422,10 +419,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;
 }
@@ -438,10 +435,10 @@ 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;
 }
@@ -474,10 +471,10 @@ 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;
 }
@@ -531,10 +528,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;
 }
@@ -547,10 +544,10 @@ 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;
 }
@@ -711,9 +708,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);
 
@@ -781,6 +778,11 @@ static struct platform_driver f71805f_driver = {
 
 static int __init f71805f_device_add(unsigned short address)
 {
+       struct resource res = {
+               .start  = address,
+               .end    = address + REGION_LENGTH - 1,
+               .flags  = IORESOURCE_IO,
+       };
        int err;
 
        pdev = platform_device_alloc(DRVNAME, address);
@@ -790,10 +792,8 @@ static int __init f71805f_device_add(unsigned short address)
                goto exit;
        }
 
-       f71805f_resource.start = address;
-       f71805f_resource.end = address + REGION_LENGTH - 1;
-       f71805f_resource.name = pdev->name;
-       err = platform_device_add_resources(pdev, &f71805f_resource, 1);
+       res.name = pdev->name;
+       err = platform_device_add_resources(pdev, &res, 1);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device resource addition failed "
                       "(%d)\n", err);