From: Jim Cromie Theres currently no reason to expose number of pins, so make it static until a reason presents itself. Also, change name to be less generic. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton --- drivers/char/scx200_gpio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/char/scx200_gpio.c~chardev-gpio-for-scx200-pc-8736x-add-platforn_device-static-numpins drivers/char/scx200_gpio.c --- a/drivers/char/scx200_gpio.c~chardev-gpio-for-scx200-pc-8736x-add-platforn_device-static-numpins +++ a/drivers/char/scx200_gpio.c @@ -119,7 +119,7 @@ static struct file_operations scx200_gpi }; struct cdev *scx200_devices; -int num_devs = 32; +static int num_pins = 32; static int __init scx200_gpio_init(void) { @@ -141,21 +141,21 @@ static int __init scx200_gpio_init(void) goto undo_platform_device_add; if (major) - rc = register_chrdev_region(dev, num_devs, "scx200_gpio"); + rc = register_chrdev_region(dev, num_pins, "scx200_gpio"); else { - rc = alloc_chrdev_region(&dev, 0, num_devs, "scx200_gpio"); + rc = alloc_chrdev_region(&dev, 0, num_pins, "scx200_gpio"); major = MAJOR(dev); } if (rc < 0) { dev_err(&pdev->dev, "SCx200 chrdev_region err: %d\n", rc); goto undo_platform_device_add; } - scx200_devices = kzalloc(num_devs * sizeof(struct cdev), GFP_KERNEL); + scx200_devices = kzalloc(num_pins * sizeof(struct cdev), GFP_KERNEL); if (!scx200_devices) { rc = -ENOMEM; goto undo_chrdev_region; } - for (i = 0; i < num_devs; i++) { + for (i = 0; i < num_pins; i++) { struct cdev *cdev = &scx200_devices[i]; cdev_init(cdev, &scx200_gpio_fops); cdev->owner = THIS_MODULE; @@ -168,7 +168,7 @@ static int __init scx200_gpio_init(void) return 0; /* succeed */ undo_chrdev_region: - unregister_chrdev_region(dev, num_devs); + unregister_chrdev_region(dev, num_pins); undo_platform_device_add: platform_device_put(pdev); kfree(pdev); /* undo platform_device_alloc */ @@ -178,7 +178,7 @@ undo_platform_device_add: static void __exit scx200_gpio_cleanup(void) { kfree(scx200_devices); - unregister_chrdev_region(MKDEV(major, 0), num_devs); + unregister_chrdev_region(MKDEV(major, 0), num_pins); platform_device_put(pdev); platform_device_unregister(pdev); /* kfree(pdev); */ _