From khali@linux-fr.org Thu Mar 23 07:39:52 2006 Date: Thu, 23 Mar 2006 16:40:23 +0100 From: Jean Delvare To: Greg KH Subject: [PATCH 06/10] f71805f: Resource needs not be global Message-Id: <20060323164023.f5380bf9.khali@linux-fr.org> Content-Disposition: inline; filename=hwmon-f71805f-no-global-resource.patch 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 Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/f71805f.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/drivers/hwmon/f71805f.c +++ gregkh-2.6/drivers/hwmon/f71805f.c @@ -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_dr 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(uns 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);