Skip to content

Commit

Permalink
parisc: convert suckyio interrupts to flow handlers
Browse files Browse the repository at this point in the history
No big deal, just need to convert the suckyio interrupts to be
a nested handler instead of request_irq the suckyio device in the
future.

Signed-off-by: Kyle McMartin <kyle@redhat.com>
  • Loading branch information
Kyle McMartin committed Oct 14, 2010
1 parent f3d4605 commit 14ff626
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions drivers/parisc/superio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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
Expand Down Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 14ff626

Please sign in to comment.