From a3628f9538be43e051a63f72d8d0fc6bb5d8b3d1 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Thu, 14 Oct 2010 00:53:17 -0400 Subject: [PATCH] --- yaml --- r: 218923 b: refs/heads/master c: 14ff626a64f1c6848b303254be00b1b2ff33a655 h: refs/heads/master i: 218921: c3717b3b7186f8dbd07426a1376c19826bff4773 218919: d5a2b98348fad797e976bbf035f712f7a73bee71 v: v3 --- [refs] | 2 +- trunk/drivers/parisc/superio.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index f1dc8a9fd46d..dec5a9c84d60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3d4605977f9f30993c670a85f75d8f3853144c5 +refs/heads/master: 14ff626a64f1c6848b303254be00b1b2ff33a655 diff --git a/trunk/drivers/parisc/superio.c b/trunk/drivers/parisc/superio.c index aceec6ed5116..0846dafdfff1 100644 --- a/trunk/drivers/parisc/superio.c +++ b/trunk/drivers/parisc/superio.c @@ -286,7 +286,7 @@ 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_disable_irq(unsigned int irq) +static void superio_mask_irq(unsigned int irq) { u8 r8; @@ -303,7 +303,7 @@ static void superio_disable_irq(unsigned int irq) outb (r8,IC_PIC1+1); } -static void superio_enable_irq(unsigned int irq) +static void superio_unmask_irq(unsigned int irq) { u8 r8; @@ -319,20 +319,11 @@ static void superio_enable_irq(unsigned int irq) outb (r8,IC_PIC1+1); } -static unsigned int superio_startup_irq(unsigned int irq) -{ - superio_enable_irq(irq); - return 0; -} - static struct irq_chip superio_interrupt_type = { - .name = SUPERIO, - .startup = superio_startup_irq, - .shutdown = superio_disable_irq, - .enable = superio_enable_irq, - .disable = superio_disable_irq, + .name = SUPERIO, + .unmask = superio_unmask_irq, + .mask = superio_mask_irq, .ack = no_ack_irq, - .end = no_end_irq, }; #ifdef DEBUG_SUPERIO_INIT @@ -363,7 +354,7 @@ int superio_fixup_irq(struct pci_dev *pcidev) #endif for (i = 0; i < 16; i++) { - set_irq_chip_and_handler(i, &superio_interrupt_type, parisc_do_IRQ); + set_irq_chip_and_handler(i, &superio_interrupt_type, handle_level_irq); } /*