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

SVN-Revision: 12864
This commit is contained in:
Gabor Juhos 2008-10-05 13:08:12 +00:00
parent 6bfeb81548
commit 5d46bb5efc
4 changed files with 12 additions and 12 deletions

View file

@ -37,7 +37,7 @@
static int dev_major; static int dev_major;
static unsigned int gpio_access_mask; 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. */ /* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1); static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out; goto out;
} }
gpio_class = class_create(THIS_MODULE, DEVNAME); gpiodev_class = class_create(THIS_MODULE, DRVNAME);
class_device_create(gpio_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME); 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); printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);

View file

@ -37,7 +37,7 @@
static int dev_major; static int dev_major;
static unsigned int gpio_access_mask; 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. */ /* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1); static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out; goto out;
} }
gpio_class = class_create(THIS_MODULE, DEVNAME); gpiodev_class = class_create(THIS_MODULE, DRVNAME);
device_create(gpio_class, NULL, MKDEV(dev_major, 0), DEVNAME); device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), DEVNAME);
printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major); printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);

View file

@ -37,7 +37,7 @@
static int dev_major; static int dev_major;
static unsigned int gpio_access_mask; 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. */ /* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1); static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out; goto out;
} }
gpio_class = class_create(THIS_MODULE, DEVNAME); gpiodev_class = class_create(THIS_MODULE, DRVNAME);
device_create(gpio_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME); device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME);
printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major); printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);

View file

@ -37,7 +37,7 @@
static int dev_major; static int dev_major;
static unsigned int gpio_access_mask; 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. */ /* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1); static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out; goto out;
} }
gpio_class = class_create(THIS_MODULE, DEVNAME); gpiodev_class = class_create(THIS_MODULE, DRVNAME);
class_device_create(gpio_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME); 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); printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);