aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index f63c706d25e1..03d0bed2b8d9 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -78,6 +78,7 @@ void dynamic_irq_cleanup(unsigned int irq)
78 desc->handle_irq = handle_bad_irq; 78 desc->handle_irq = handle_bad_irq;
79 desc->chip = &no_irq_chip; 79 desc->chip = &no_irq_chip;
80 desc->name = NULL; 80 desc->name = NULL;
81 clear_kstat_irqs(desc);
81 spin_unlock_irqrestore(&desc->lock, flags); 82 spin_unlock_irqrestore(&desc->lock, flags);
82} 83}
83 84
@@ -290,7 +291,8 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
290 desc->chip->mask_ack(irq); 291 desc->chip->mask_ack(irq);
291 else { 292 else {
292 desc->chip->mask(irq); 293 desc->chip->mask(irq);
293 desc->chip->ack(irq); 294 if (desc->chip->ack)
295 desc->chip->ack(irq);
294 } 296 }
295} 297}
296 298
@@ -383,6 +385,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
383out_unlock: 385out_unlock:
384 spin_unlock(&desc->lock); 386 spin_unlock(&desc->lock);
385} 387}
388EXPORT_SYMBOL_GPL(handle_level_irq);
386 389
387/** 390/**
388 * handle_fasteoi_irq - irq handler for transparent controllers 391 * handle_fasteoi_irq - irq handler for transparent controllers
@@ -475,7 +478,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
475 kstat_incr_irqs_this_cpu(irq, desc); 478 kstat_incr_irqs_this_cpu(irq, desc);
476 479
477 /* Start handling the irq */ 480 /* Start handling the irq */
478 desc->chip->ack(irq); 481 if (desc->chip->ack)
482 desc->chip->ack(irq);
479 desc = irq_remap_to_desc(irq, desc); 483 desc = irq_remap_to_desc(irq, desc);
480 484
481 /* Mark the IRQ currently in progress.*/ 485 /* Mark the IRQ currently in progress.*/
@@ -593,6 +597,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
593 } 597 }
594 spin_unlock_irqrestore(&desc->lock, flags); 598 spin_unlock_irqrestore(&desc->lock, flags);
595} 599}
600EXPORT_SYMBOL_GPL(__set_irq_handler);
596 601
597void 602void
598set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip, 603set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,