diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 02:54:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 19:53:16 -0400 |
| commit | 5712cb3d81566893c3b14e24075cf48ec5c35d00 (patch) | |
| tree | 8258fb24a0c5130e8c0cad16d2d9395941be3ed7 /drivers/parport | |
| parent | f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b (diff) | |
| download | linux-5712cb3d81566893c3b14e24075cf48ec5c35d00.tar.gz linux-5712cb3d81566893c3b14e24075cf48ec5c35d00.tar.bz2 linux-5712cb3d81566893c3b14e24075cf48ec5c35d00.zip | |
[PARPORT] Remove unused 'irq' argument from parport irq functions
None of the drivers with a struct pardevice's ->irq_func() hook ever
used the 'irq' argument passed to it, so remove it.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/daisy.c | 13 | ||||
| -rw-r--r-- | drivers/parport/probe.c | 3 | ||||
| -rw-r--r-- | drivers/parport/share.c | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c index 5bbff2028f8f..3c8f06c3a5a0 100644 --- a/drivers/parport/daisy.c +++ b/drivers/parport/daisy.c @@ -199,11 +199,6 @@ void parport_daisy_fini(struct parport *port) * parport_open - find a device by canonical device number * @devnum: canonical device number * @name: name to associate with the device - * @pf: preemption callback - * @kf: kick callback - * @irqf: interrupt handler - * @flags: registration flags - * @handle: driver data * * This function is similar to parport_register_device(), except * that it locates a device by its number rather than by the port @@ -214,10 +209,7 @@ void parport_daisy_fini(struct parport *port) * for parport_register_device(). **/ -struct pardevice *parport_open(int devnum, const char *name, - int (*pf) (void *), void (*kf) (void *), - void (*irqf) (int, void *), - int flags, void *handle) +struct pardevice *parport_open(int devnum, const char *name) { struct daisydev *p = topology; struct parport *port; @@ -237,8 +229,7 @@ struct pardevice *parport_open(int devnum, const char *name, port = parport_get_port(p->port); spin_unlock(&topology_lock); - dev = parport_register_device(port, name, pf, kf, - irqf, flags, handle); + dev = parport_register_device(port, name, NULL, NULL, NULL, 0, NULL); parport_put_port(port); if (!dev) return NULL; diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index ea83b70e0de2..853a15f44f88 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c @@ -255,8 +255,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer, ssize_t parport_device_id (int devnum, char *buffer, size_t count) { ssize_t retval = -ENXIO; - struct pardevice *dev = parport_open (devnum, "Device ID probe", - NULL, NULL, NULL, 0, NULL); + struct pardevice *dev = parport_open (devnum, "Device ID probe"); if (!dev) return -ENXIO; diff --git a/drivers/parport/share.c b/drivers/parport/share.c index d0b353cf14ac..a8a62bbbb576 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c @@ -524,7 +524,7 @@ void parport_remove_port(struct parport *port) struct pardevice * parport_register_device(struct parport *port, const char *name, int (*pf)(void *), void (*kf)(void *), - void (*irq_func)(int, void *), + void (*irq_func)(void *), int flags, void *handle) { struct pardevice *tmp; |