diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:39 -0700 |
commit | 25c263542ddf9396012b6a6fa2b327d304f7f9a3 (patch) | |
tree | d7258f81da125b0bf4a2ce0ede2e79db38a7ed04 /drivers/parport/daisy.c | |
parent | d8581969904b8a72db726c4b9090234c0f0bb18f (diff) | |
parent | 7c2399756ab8ccb2c57da4630b4aa4a1d61b3846 (diff) |
Merge branch 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
drivers/char/riscom8: clean up irq handling
isdn/sc: irq handler clean
isdn/act2000: fix major bug. clean irq handler.
char/pcmcia/synclink_cs: trim trailing whitespace
drivers/char/ip2: separate polling and irq-driven work entry points
drivers/char/ip2: split out irq core logic into separate function
[NETDRVR] lib82596, netxen: delete pointless tests from irq handler
Eliminate pointless casts from void* in a few driver irq handlers.
[PARPORT] Remove unused 'irq' argument from parport irq functions
[PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
[PARPORT] Consolidate code copies into a single generic irq handler
Diffstat (limited to 'drivers/parport/daisy.c')
-rw-r--r-- | drivers/parport/daisy.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c index 5bbff2028f8..3c8f06c3a5a 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; |