diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:21:02 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:21:02 -0600 |
| commit | 1c0f647690f1b9471d63af48dec960bc59492e61 (patch) | |
| tree | 5bfaabb033ec7b907a7c7ee19603d012e1c82867 /drivers/parisc/eisa.c | |
| parent | 2c250ad23d438fa56e1beded374e44dc565c6c47 (diff) | |
| parent | 4c4231ea2f794d73bbb50b8d84e00c66a012a607 (diff) | |
Merge branch 'irq' into for-next
Diffstat (limited to 'drivers/parisc/eisa.c')
| -rw-r--r-- | drivers/parisc/eisa.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index e860038b0b8..deeec32a580 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c @@ -144,8 +144,9 @@ static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered * /* called by free irq */ -static void eisa_mask_irq(unsigned int irq) +static void eisa_mask_irq(struct irq_data *d) { + unsigned int irq = d->irq; unsigned long flags; EISA_DBG("disable irq %d\n", irq); @@ -164,8 +165,9 @@ static void eisa_mask_irq(unsigned int irq) } /* called by request irq */ -static void eisa_unmask_irq(unsigned int irq) +static void eisa_unmask_irq(struct irq_data *d) { + unsigned int irq = d->irq; unsigned long flags; EISA_DBG("enable irq %d\n", irq); @@ -183,9 +185,9 @@ static void eisa_unmask_irq(unsigned int irq) } static struct irq_chip eisa_interrupt_type = { - .name = "EISA", - .unmask = eisa_unmask_irq, - .mask = eisa_mask_irq, + .name = "EISA", + .irq_unmask = eisa_unmask_irq, + .irq_mask = eisa_mask_irq, }; static irqreturn_t eisa_irq(int wax_irq, void *intr_dev) |