diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-06 20:45:52 +0000 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 10:22:14 -0600 |
| commit | 4c4231ea2f794d73bbb50b8d84e00c66a012a607 (patch) | |
| tree | 4c2470ea880a75c22f275402fe5a186902edd6d5 /drivers/parisc/superio.c | |
| parent | 9804c9eaeacfe78651052c5ddff31099f60ef78c (diff) | |
| download | op-kernel-dev-4c4231ea2f794d73bbb50b8d84e00c66a012a607.zip op-kernel-dev-4c4231ea2f794d73bbb50b8d84e00c66a012a607.tar.gz | |
[PARISC] Convert to new irq_chip functions
Convert all the parisc driver interrupt handlers (dino, eisa, gsc,
iosapic and superio) as well as the cpu interrupts. Prepare
show_interrupts for GENERIC_HARDIRQS_NO_DEPRECATED and finally selects
that Kconfig option
[jejb: compile and testing fixes]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/parisc/superio.c')
| -rw-r--r-- | drivers/parisc/superio.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index 28241532c..a4d8ff6 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -286,8 +286,9 @@ superio_init(struct pci_dev *pcidev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO, superio_init); -static void superio_mask_irq(unsigned int irq) +static void superio_mask_irq(struct irq_data *d) { + unsigned int irq = d->irq; u8 r8; if ((irq < 1) || (irq == 2) || (irq > 7)) { @@ -303,8 +304,9 @@ static void superio_mask_irq(unsigned int irq) outb (r8,IC_PIC1+1); } -static void superio_unmask_irq(unsigned int irq) +static void superio_unmask_irq(struct irq_data *d) { + unsigned int irq = d->irq; u8 r8; if ((irq < 1) || (irq == 2) || (irq > 7)) { @@ -320,9 +322,9 @@ static void superio_unmask_irq(unsigned int irq) } static struct irq_chip superio_interrupt_type = { - .name = SUPERIO, - .unmask = superio_unmask_irq, - .mask = superio_mask_irq, + .name = SUPERIO, + .irq_unmask = superio_unmask_irq, + .irq_mask = superio_mask_irq, }; #ifdef DEBUG_SUPERIO_INIT |
