diff options
Diffstat (limited to 'arch/mips/sgi-ip27/ip27-irq.c')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-irq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index 597ec73359b7..24a85372284f 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c | |||
@@ -296,7 +296,6 @@ static void shutdown_bridge_irq(unsigned int irq) | |||
296 | struct bridge_controller *bc = IRQ_TO_BRIDGE(irq); | 296 | struct bridge_controller *bc = IRQ_TO_BRIDGE(irq); |
297 | struct hub_data *hub = hub_data(cpu_to_node(bc->irq_cpu)); | 297 | struct hub_data *hub = hub_data(cpu_to_node(bc->irq_cpu)); |
298 | bridge_t *bridge = bc->base; | 298 | bridge_t *bridge = bc->base; |
299 | struct slice_data *si = cpu_data[bc->irq_cpu].data; | ||
300 | int pin, swlevel; | 299 | int pin, swlevel; |
301 | cpuid_t cpu; | 300 | cpuid_t cpu; |
302 | 301 | ||
@@ -311,7 +310,6 @@ static void shutdown_bridge_irq(unsigned int irq) | |||
311 | intr_disconnect_level(cpu, swlevel); | 310 | intr_disconnect_level(cpu, swlevel); |
312 | 311 | ||
313 | __clear_bit(swlevel, hub->irq_alloc_mask); | 312 | __clear_bit(swlevel, hub->irq_alloc_mask); |
314 | si->level_to_irq[swlevel] = -1; | ||
315 | 313 | ||
316 | bridge->b_int_enable &= ~(1 << pin); | 314 | bridge->b_int_enable &= ~(1 << pin); |
317 | bridge->b_wid_tflush; | 315 | bridge->b_wid_tflush; |
@@ -347,7 +345,7 @@ static void end_bridge_irq(unsigned int irq) | |||
347 | enable_bridge_irq(irq); | 345 | enable_bridge_irq(irq); |
348 | } | 346 | } |
349 | 347 | ||
350 | static struct hw_interrupt_type bridge_irq_type = { | 348 | static struct irq_chip bridge_irq_type = { |
351 | .typename = "bridge", | 349 | .typename = "bridge", |
352 | .startup = startup_bridge_irq, | 350 | .startup = startup_bridge_irq, |
353 | .shutdown = shutdown_bridge_irq, | 351 | .shutdown = shutdown_bridge_irq, |