[kernel] make gpio_dev compatible with GPIOLIB & GPIO_SYSFS (closes #4016)

SVN-Revision: 12864

diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
index 48ef76f8a962ac7afef99244960a4a5b6309c5bc..4dc637471cc456e8a6845b4113b694bc6353d62c 100644 (file)
--- a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
 
 static int dev_major;
 static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
 
 /* Counter is 1, if the device is not opened and zero (or less) if opened. */
 static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
                goto out;
        }
 
-       gpio_class = class_create(THIS_MODULE, DEVNAME);
-       class_device_create(gpio_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
+       gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+       class_device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
 
        printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
 

diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c
index b09ebeffad69bf0d8567182bfb3111e889e97a0d..b82d2f13e5951c1f48584877a72b12b50e3597b4 100644 (file)
--- a/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
 
 static int dev_major;
 static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
 
 /* Counter is 1, if the device is not opened and zero (or less) if opened. */
 static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
                goto out;
        }
 
-       gpio_class = class_create(THIS_MODULE, DEVNAME);
-       device_create(gpio_class, NULL, MKDEV(dev_major, 0), DEVNAME);
+       gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+       device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), DEVNAME);
 
        printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
 

diff --git a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
index 48ef76f8a962ac7afef99244960a4a5b6309c5bc..4dc637471cc456e8a6845b4113b694bc6353d62c 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
 
 static int dev_major;
 static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
 
 /* Counter is 1, if the device is not opened and zero (or less) if opened. */
 static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
                goto out;
        }
 
-       gpio_class = class_create(THIS_MODULE, DEVNAME);
-       class_device_create(gpio_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
+       gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+       class_device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
 
        printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);