[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>

+9 -9
+1 -1
drivers/parport/ieee1284.c
··· 571 571 #endif /* IEEE1284 support */ 572 572 573 573 /* Handle an interrupt. */ 574 - void parport_ieee1284_interrupt (int which, void *handle) 574 + void parport_ieee1284_interrupt (void *handle) 575 575 { 576 576 struct parport *port = handle; 577 577 parport_ieee1284_wakeup (port);
+1 -1
drivers/parport/parport_mfc3.c
··· 219 219 if (this_port[i] != NULL) 220 220 if (pia(this_port[i])->crb & 128) { /* Board caused interrupt */ 221 221 dummy = pia(this_port[i])->pprb; /* clear irq bit */ 222 - parport_generic_irq(irq, this_port[i]); 222 + parport_generic_irq(this_port[i]); 223 223 } 224 224 return IRQ_HANDLED; 225 225 }
+1 -1
drivers/parport/share.c
··· 999 999 { 1000 1000 struct parport *port = dev_id; 1001 1001 1002 - parport_generic_irq(irq, port); 1002 + parport_generic_irq(port); 1003 1003 1004 1004 return IRQ_HANDLED; 1005 1005 }
+2 -2
drivers/usb/misc/uss720.c
··· 128 128 #endif 129 129 /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ 130 130 if (rq->reg[2] & rq->reg[1] & 0x10 && pp) 131 - parport_generic_irq(0, pp); 131 + parport_generic_irq(pp); 132 132 } 133 133 complete(&rq->compl); 134 134 kref_put(&rq->ref_count, destroy_async); ··· 337 337 memcpy(priv->reg, buffer, 4); 338 338 /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ 339 339 if (priv->reg[2] & priv->reg[1] & 0x10) 340 - parport_generic_irq(0, pp); 340 + parport_generic_irq(pp); 341 341 return 1; 342 342 } 343 343 #endif
+4 -4
include/linux/parport.h
··· 465 465 #define PARPORT_FLAG_EXCL (1<<1) /* EXCL driver registered. */ 466 466 467 467 /* IEEE1284 functions */ 468 - extern void parport_ieee1284_interrupt (int, void *); 468 + extern void parport_ieee1284_interrupt (void *); 469 469 extern int parport_negotiate (struct parport *, int mode); 470 470 extern ssize_t parport_write (struct parport *, const void *buf, size_t len); 471 471 extern ssize_t parport_read (struct parport *, void *buf, size_t len); ··· 518 518 extern int parport_daisy_select (struct parport *port, int daisy, int mode); 519 519 520 520 /* Lowlevel drivers _can_ call this support function to handle irqs. */ 521 - static inline void parport_generic_irq(int irq, struct parport *port) 521 + static inline void parport_generic_irq(struct parport *port) 522 522 { 523 - parport_ieee1284_interrupt (irq, port); 523 + parport_ieee1284_interrupt (port); 524 524 read_lock(&port->cad_lock); 525 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 527 read_unlock(&port->cad_lock); 528 528 } 529 529