Commit 14ff626a64f1c6848b303254be00b1b2ff33a655
1 parent
f3d4605977
Exists in
master
and in
4 other branches
parisc: convert suckyio interrupts to flow handlers
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>
Showing 1 changed file with 6 additions and 15 deletions Side-by-side Diff
drivers/parisc/superio.c
| ... | ... | @@ -286,7 +286,7 @@ |
| 286 | 286 | } |
| 287 | 287 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO, superio_init); |
| 288 | 288 | |
| 289 | -static void superio_disable_irq(unsigned int irq) | |
| 289 | +static void superio_mask_irq(unsigned int irq) | |
| 290 | 290 | { |
| 291 | 291 | u8 r8; |
| 292 | 292 | |
| ... | ... | @@ -303,7 +303,7 @@ |
| 303 | 303 | outb (r8,IC_PIC1+1); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | -static void superio_enable_irq(unsigned int irq) | |
| 306 | +static void superio_unmask_irq(unsigned int irq) | |
| 307 | 307 | { |
| 308 | 308 | u8 r8; |
| 309 | 309 | |
| 310 | 310 | |
| 311 | 311 | |
| ... | ... | @@ -319,20 +319,11 @@ |
| 319 | 319 | outb (r8,IC_PIC1+1); |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | -static unsigned int superio_startup_irq(unsigned int irq) | |
| 323 | -{ | |
| 324 | - superio_enable_irq(irq); | |
| 325 | - return 0; | |
| 326 | -} | |
| 327 | - | |
| 328 | 322 | static struct irq_chip superio_interrupt_type = { |
| 329 | - .name = SUPERIO, | |
| 330 | - .startup = superio_startup_irq, | |
| 331 | - .shutdown = superio_disable_irq, | |
| 332 | - .enable = superio_enable_irq, | |
| 333 | - .disable = superio_disable_irq, | |
| 323 | + .name = SUPERIO, | |
| 324 | + .unmask = superio_unmask_irq, | |
| 325 | + .mask = superio_mask_irq, | |
| 334 | 326 | .ack = no_ack_irq, |
| 335 | - .end = no_end_irq, | |
| 336 | 327 | }; |
| 337 | 328 | |
| 338 | 329 | #ifdef DEBUG_SUPERIO_INIT |
| ... | ... | @@ -363,7 +354,7 @@ |
| 363 | 354 | #endif |
| 364 | 355 | |
| 365 | 356 | for (i = 0; i < 16; i++) { |
| 366 | - set_irq_chip_and_handler(i, &superio_interrupt_type, parisc_do_IRQ); | |
| 357 | + set_irq_chip_and_handler(i, &superio_interrupt_type, handle_level_irq); | |
| 367 | 358 | } |
| 368 | 359 | |
| 369 | 360 | /* |