[PATCH] pc8736x_gpio: fix re-modprobe errors: fix/finish cdev-init

- Switch from register_chrdev() to   (register|alloc)_chrdev_region().

- use a cdev.  This was intended for original patchset, but was
  overlooked.

  We use a single cdev for all pins (minor device-numbers), as gleaned
  from cs5535_gpio, and in contrast to whats currently done in scx200_gpio
  (which I'll fix soon)

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jim Cromie 2006-07-10 04:45:37 -07:00 коммит произвёл Linus Torvalds
Родитель 27385085f1
Коммит babcfade47
1 изменённых файлов: 15 добавлений и 2 удалений

Просмотреть файл

@ -259,7 +259,8 @@ static struct cdev pc8736x_gpio_cdev;
static int __init pc8736x_gpio_init(void) static int __init pc8736x_gpio_init(void)
{ {
int rc = 0; int rc;
dev_t devid;
pdev = platform_device_alloc(DEVNAME, 0); pdev = platform_device_alloc(DEVNAME, 0);
if (!pdev) if (!pdev)
@ -307,7 +308,14 @@ static int __init pc8736x_gpio_init(void)
} }
dev_info(&pdev->dev, "GPIO ioport %x reserved\n", pc8736x_gpio_base); dev_info(&pdev->dev, "GPIO ioport %x reserved\n", pc8736x_gpio_base);
rc = register_chrdev(major, DEVNAME, &pc8736x_gpio_fops); if (major) {
devid = MKDEV(major, 0);
rc = register_chrdev_region(devid, PC8736X_GPIO_CT, DEVNAME);
} else {
rc = alloc_chrdev_region(&devid, 0, PC8736X_GPIO_CT, DEVNAME);
major = MAJOR(devid);
}
if (rc < 0) { if (rc < 0) {
dev_err(&pdev->dev, "register-chrdev failed: %d\n", rc); dev_err(&pdev->dev, "register-chrdev failed: %d\n", rc);
goto undo_request_region; goto undo_request_region;
@ -318,6 +326,11 @@ static int __init pc8736x_gpio_init(void)
} }
pc8736x_init_shadow(); pc8736x_init_shadow();
/* ignore minor errs, and succeed */
cdev_init(&pc8736x_gpio_cdev, &pc8736x_gpio_fops);
cdev_add(&pc8736x_gpio_cdev, devid, PC8736X_GPIO_CT);
return 0; return 0;
undo_request_region: undo_request_region: