redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[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>
hifive-unleashed-5.1
Jeff Garzik 2007-10-19 01:56:02 -04:00
parent 3f2e40df0e
commit f230d1010a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/parport/ieee1284.c
View File

@ -571,7 +571,7 @@ static int parport_ieee1284_ack_data_avail (struct parport *port)
#endif /* IEEE1284 support */
/* Handle an interrupt. */
void parport_ieee1284_interrupt (int which, void *handle)
void parport_ieee1284_interrupt (void *handle)
{
struct parport *port = handle;
parport_ieee1284_wakeup (port);

2
drivers/parport/parport_mfc3.c
View File

@ -219,7 +219,7 @@ static irqreturn_t mfc3_interrupt(int irq, void *dev_id)
if (this_port[i] != NULL)
if (pia(this_port[i])->crb & 128) { /* Board caused interrupt */
dummy = pia(this_port[i])->pprb; /* clear irq bit */
parport_generic_irq(irq, this_port[i]);
parport_generic_irq(this_port[i]);
}
return IRQ_HANDLED;
}

2
drivers/parport/share.c
View File

@ -999,7 +999,7 @@ irqreturn_t parport_irq_handler(int irq, void *dev_id)
{
struct parport *port = dev_id;
parport_generic_irq(irq, port);
parport_generic_irq(port);
return IRQ_HANDLED;
}

4
drivers/usb/misc/uss720.c
View File

@ -128,7 +128,7 @@ static void async_complete(struct urb *urb)
#endif
/* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
if (rq->reg[2] & rq->reg[1] & 0x10 && pp)
parport_generic_irq(0, pp);
parport_generic_irq(pp);
}
complete(&rq->compl);
kref_put(&rq->ref_count, destroy_async);
@ -337,7 +337,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id)
memcpy(priv->reg, buffer, 4);
/* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
if (priv->reg[2] & priv->reg[1] & 0x10)
parport_generic_irq(0, pp);
parport_generic_irq(pp);
return 1;
}
#endif

8
include/linux/parport.h
View File

@ -465,7 +465,7 @@ static __inline__ int parport_yield_blocking(struct pardevice *dev)
#define PARPORT_FLAG_EXCL (1<<1) /* EXCL driver registered. */
/* IEEE1284 functions */
extern void parport_ieee1284_interrupt (int, void *);
extern void parport_ieee1284_interrupt (void *);
extern int parport_negotiate (struct parport *, int mode);
extern ssize_t parport_write (struct parport *, const void *buf, size_t len);
extern ssize_t parport_read (struct parport *, void *buf, size_t len);
@ -518,12 +518,12 @@ extern void parport_daisy_deselect_all (struct parport *port);
extern int parport_daisy_select (struct parport *port, int daisy, int mode);
/* Lowlevel drivers _can_ call this support function to handle irqs. */
static inline void parport_generic_irq(int irq, struct parport *port)
static inline void parport_generic_irq(struct parport *port)
{
parport_ieee1284_interrupt (irq, port);
parport_ieee1284_interrupt (port);
read_lock(&port->cad_lock);
if (port->cad && port->cad->irq_func)
port->cad->irq_func(irq, port->cad->private);
port->cad->irq_func(port->irq, port->cad->private);
read_unlock(&port->cad_lock);
}