aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/superio.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-06 15:45:52 -0500
committerJames Bottomley <James.Bottomley@suse.de>2011-02-10 11:22:14 -0500
commit4c4231ea2f794d73bbb50b8d84e00c66a012a607 (patch)
tree4c2470ea880a75c22f275402fe5a186902edd6d5 /drivers/parisc/superio.c
parent9804c9eaeacfe78651052c5ddff31099f60ef78c (diff)
[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.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 28241532c0f..a4d8ff66a63 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -286,8 +286,9 @@ superio_init(struct pci_dev *pcidev)
286} 286}
287DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO, superio_init); 287DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO, superio_init);
288 288
289static void superio_mask_irq(unsigned int irq) 289static void superio_mask_irq(struct irq_data *d)
290{ 290{
291 unsigned int irq = d->irq;
291 u8 r8; 292 u8 r8;
292 293
293 if ((irq < 1) || (irq == 2) || (irq > 7)) { 294 if ((irq < 1) || (irq == 2) || (irq > 7)) {
@@ -303,8 +304,9 @@ static void superio_mask_irq(unsigned int irq)
303 outb (r8,IC_PIC1+1); 304 outb (r8,IC_PIC1+1);
304} 305}
305 306
306static void superio_unmask_irq(unsigned int irq) 307static void superio_unmask_irq(struct irq_data *d)
307{ 308{
309 unsigned int irq = d->irq;
308 u8 r8; 310 u8 r8;
309 311
310 if ((irq < 1) || (irq == 2) || (irq > 7)) { 312 if ((irq < 1) || (irq == 2) || (irq > 7)) {
@@ -320,9 +322,9 @@ static void superio_unmask_irq(unsigned int irq)
320} 322}
321 323
322static struct irq_chip superio_interrupt_type = { 324static struct irq_chip superio_interrupt_type = {
323 .name = SUPERIO, 325 .name = SUPERIO,
324 .unmask = superio_unmask_irq, 326 .irq_unmask = superio_unmask_irq,
325 .mask = superio_mask_irq, 327 .irq_mask = superio_mask_irq,
326}; 328};
327 329
328#ifdef DEBUG_SUPERIO_INIT 330#ifdef DEBUG_SUPERIO_INIT