X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fite_gpio.c;h=d1ed6ac950d1208891188d1972530262d46c85d9;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=1a4dfef7e46db125f2626306e11bec97ba410b3e;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/char/ite_gpio.c b/drivers/char/ite_gpio.c index 1a4dfef7e..d1ed6ac95 100644 --- a/drivers/char/ite_gpio.c +++ b/drivers/char/ite_gpio.c @@ -30,9 +30,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include -#include #include #include #include @@ -238,10 +236,6 @@ EXPORT_SYMBOL(ite_gpio_int_wait); static int ite_gpio_open(struct inode *inode, struct file *file) { - unsigned int minor = iminor(inode); - if (minor != GPIO_MINOR) - return -ENODEV; - return 0; } @@ -255,7 +249,6 @@ static int ite_gpio_release(struct inode *inode, struct file *file) static int ite_gpio_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - static struct ite_gpio_ioctl_data ioctl_data; if (copy_from_user(&ioctl_data, (struct ite_gpio_ioctl_data *)arg, @@ -314,10 +307,12 @@ static int ite_gpio_ioctl(struct inode *inode, struct file *file, return -ENOIOCTLCMD; } + return 0; } -static void ite_gpio_irq_handler(int this_irq, void *dev_id, struct pt_regs *regs) +static void ite_gpio_irq_handler(int this_irq, void *dev_id, + struct pt_regs *regs) { int i,line; @@ -362,18 +357,15 @@ DEB(printk("interrupt 0x%x %d\n",ITE_GPAISR, i)); } } -static struct file_operations ite_gpio_fops = -{ +static struct file_operations ite_gpio_fops = { .owner = THIS_MODULE, .ioctl = ite_gpio_ioctl, .open = ite_gpio_open, .release = ite_gpio_release, }; -/* GPIO_MINOR in include/linux/miscdevice.h */ -static struct miscdevice ite_gpio_miscdev = -{ - GPIO_MINOR, +static struct miscdevice ite_gpio_miscdev = { + MISC_DYNAMIC_MINOR, "ite_gpio", &ite_gpio_fops }; @@ -416,7 +408,7 @@ int __init ite_gpio_init(void) return 0; } -void __exit ite_gpio_exit(void) +static void __exit ite_gpio_exit(void) { misc_deregister(&ite_gpio_miscdev); }