aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 01:56:02 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 19:53:15 -0400
commitf230d1010ad0dcd71d9ca8ea6864afac49c5aa9b (patch)
tree6bb5e61167c520727724c9ad0297f3bcd743151b /include/linux
parent3f2e40df0e1d7694224c3083b0bebd129039a40a (diff)
[PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
parport_ieee1284_interrupt() was not using its first arg at all. Delete. parport_generic_irq()'s second arg makes its first arg completely redundant. Delete, and use port->irq in the one place where we actually need it. Also, s/__inline__/inline/ to make the code look nicer. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/parport.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 66026eab10c7..557c37de1f38 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -465,7 +465,7 @@ static __inline__ int parport_yield_blocking(struct pardevice *dev)
465#define PARPORT_FLAG_EXCL (1<<1) /* EXCL driver registered. */ 465#define PARPORT_FLAG_EXCL (1<<1) /* EXCL driver registered. */
466 466
467/* IEEE1284 functions */ 467/* IEEE1284 functions */
468extern void parport_ieee1284_interrupt (int, void *); 468extern void parport_ieee1284_interrupt (void *);
469extern int parport_negotiate (struct parport *, int mode); 469extern int parport_negotiate (struct parport *, int mode);
470extern ssize_t parport_write (struct parport *, const void *buf, size_t len); 470extern ssize_t parport_write (struct parport *, const void *buf, size_t len);
471extern ssize_t parport_read (struct parport *, void *buf, size_t len); 471extern ssize_t parport_read (struct parport *, void *buf, size_t len);
@@ -518,12 +518,12 @@ extern void parport_daisy_deselect_all (struct parport *port);
518extern int parport_daisy_select (struct parport *port, int daisy, int mode); 518extern int parport_daisy_select (struct parport *port, int daisy, int mode);
519 519
520/* Lowlevel drivers _can_ call this support function to handle irqs. */ 520/* Lowlevel drivers _can_ call this support function to handle irqs. */
521static inline void parport_generic_irq(int irq, struct parport *port) 521static inline void parport_generic_irq(struct parport *port)
522{ 522{
523 parport_ieee1284_interrupt (irq, port); 523 parport_ieee1284_interrupt (port);
524 read_lock(&port->cad_lock); 524 read_lock(&port->cad_lock);
525 if (port->cad && port->cad->irq_func) 525 if (port->cad && port->cad->irq_func)
526 port->cad->irq_func(irq, port->cad->private); 526 port->cad->irq_func(port->irq, port->cad->private);
527 read_unlock(&port->cad_lock); 527 read_unlock(&port->cad_lock);
528} 528}
529 529