]> err.no Git - linux-2.6/commitdiff
[PATCH] f71805f: Resource needs not be global
authorJean Delvare <khali@linux-fr.org>
Thu, 23 Mar 2006 15:40:23 +0000 (16:40 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 22 Jun 2006 18:10:32 +0000 (11:10 -0700)
The F71805F I/O resource structure needs not be a global variable,
as the platform core allocs its own copy of it anyway.

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

index 885465df6e6a68db40f89c0d1b64c87efaf089c7..fd72440faf76167e08a22d9409255a70c4dba256 100644 (file)
@@ -99,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
  */
@@ -782,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);
@@ -791,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);