github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

[PATCH] scx200_gpio: use 1 cdev for N minors, not N for N

Browse Source 
Remove the scx200_gpio's cdev-array & ksalloc, replacing it with a single
static struct cdev, which is sufficient for all the pins.

cdev_put is commented out since kernel wont link properly with it, and its
apparently not needed.

With these patches, this driver continues to work with Chris Boot's
leds_48xx driver.

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-14 00:24:16 -07:00 committed by Linus Torvalds
parent ae2d1f2f5b
commit 635adb6cd2
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/char/scx200_gpio.c
View File

@ -63,7 +63,6 @@ static int scx200_gpio_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static const struct file_operations scx200_gpio_fops = { static const struct file_operations scx200_gpio_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.write = nsc_gpio_write, .write = nsc_gpio_write,
@ -72,11 +71,11 @@ static const struct file_operations scx200_gpio_fops = {
.release = scx200_gpio_release, .release = scx200_gpio_release,
}; };
struct cdev *scx200_devices; struct cdev scx200_gpio_cdev; /* use 1 cdev for all pins */
static int __init scx200_gpio_init(void) static int __init scx200_gpio_init(void)
{ {
int rc, i; int rc;
dev_t devid; dev_t devid;
if (!scx200_gpio_present()) { if (!scx200_gpio_present()) {
@ -107,25 +106,12 @@ static int __init scx200_gpio_init(void)
dev_err(&pdev->dev, "SCx200 chrdev_region err: %d\n", rc); dev_err(&pdev->dev, "SCx200 chrdev_region err: %d\n", rc);
goto undo_platform_device_add; goto undo_platform_device_add;
} }
scx200_devices = kzalloc(MAX_PINS * sizeof(struct cdev), GFP_KERNEL);
if (!scx200_devices) { cdev_init(&scx200_gpio_cdev, &scx200_gpio_fops);
rc = -ENOMEM; cdev_add(&scx200_gpio_cdev, devid, MAX_PINS);
goto undo_chrdev_region;
}
for (i = 0; i < MAX_PINS; i++) {
struct cdev *cdev = &scx200_devices[i];
cdev_init(cdev, &scx200_gpio_fops);
cdev->owner = THIS_MODULE;
rc = cdev_add(cdev, MKDEV(major, i), 1);
/* tolerate 'minor' errors */
if (rc)
dev_err(&pdev->dev, "Error %d on minor %d", rc, i);
}
return 0; /* succeed */ return 0; /* succeed */
undo_chrdev_region:
unregister_chrdev_region(devid, MAX_PINS);
undo_platform_device_add: undo_platform_device_add:
platform_device_del(pdev); platform_device_del(pdev);
undo_malloc: undo_malloc:
@ -136,7 +122,9 @@ static int __init scx200_gpio_init(void)
static void __exit scx200_gpio_cleanup(void) static void __exit scx200_gpio_cleanup(void)
{ {
kfree(scx200_devices); cdev_del(&scx200_gpio_cdev);
/* cdev_put(&scx200_gpio_cdev); */
unregister_chrdev_region(MKDEV(major, 0), MAX_PINS); unregister_chrdev_region(MKDEV(major, 0), MAX_PINS);
platform_device_unregister(pdev); platform_device_unregister(pdev);
} }