Commit 8ed5c00d7c166f505eb2e8ff47748bfa73824130
1 parent
7998b3bd15
Exists in
master
and in
4 other branches
parisc: convert eisa interrupts to flow handlers
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Showing 1 changed file with 7 additions and 16 deletions Side-by-side Diff
drivers/parisc/eisa.c
| ... | ... | @@ -144,7 +144,7 @@ |
| 144 | 144 | |
| 145 | 145 | |
| 146 | 146 | /* called by free irq */ |
| 147 | -static void eisa_disable_irq(unsigned int irq) | |
| 147 | +static void eisa_mask_irq(unsigned int irq) | |
| 148 | 148 | { |
| 149 | 149 | unsigned long flags; |
| 150 | 150 | |
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /* called by request irq */ |
| 167 | -static void eisa_enable_irq(unsigned int irq) | |
| 167 | +static void eisa_unmask_irq(unsigned int irq) | |
| 168 | 168 | { |
| 169 | 169 | unsigned long flags; |
| 170 | 170 | EISA_DBG("enable irq %d\n", irq); |
| 171 | 171 | |
| ... | ... | @@ -182,20 +182,11 @@ |
| 182 | 182 | EISA_DBG("pic1 mask %02x\n", eisa_in8(0xa1)); |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | -static unsigned int eisa_startup_irq(unsigned int irq) | |
| 186 | -{ | |
| 187 | - eisa_enable_irq(irq); | |
| 188 | - return 0; | |
| 189 | -} | |
| 190 | - | |
| 191 | 185 | static struct irq_chip eisa_interrupt_type = { |
| 192 | - .name = "EISA", | |
| 193 | - .startup = eisa_startup_irq, | |
| 194 | - .shutdown = eisa_disable_irq, | |
| 195 | - .enable = eisa_enable_irq, | |
| 196 | - .disable = eisa_disable_irq, | |
| 197 | - .ack = no_ack_irq, | |
| 198 | - .end = no_end_irq, | |
| 186 | + .name = "EISA", | |
| 187 | + .unmask = eisa_unmask_irq, | |
| 188 | + .mask = eisa_mask_irq, | |
| 189 | + .ack = no_ack_irq, | |
| 199 | 190 | }; |
| 200 | 191 | |
| 201 | 192 | static irqreturn_t eisa_irq(int wax_irq, void *intr_dev) |
| ... | ... | @@ -349,7 +340,7 @@ |
| 349 | 340 | setup_irq(2, &irq2_action); |
| 350 | 341 | for (i = 0; i < 16; i++) { |
| 351 | 342 | set_irq_chip_and_handler(i, &eisa_interrupt_type, |
| 352 | - parisc_do_IRQ); | |
| 343 | + handle_level_irq); | |
| 353 | 344 | } |
| 354 | 345 | |
| 355 | 346 | EISA_bus = 1; |