aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-27 08:44:35 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-04 06:43:35 -0400
commit3876ec9ef3775d062345b3760d3271ecb8cd3fea (patch)
tree6c1cd233753fe09d48bdf107da34b4dbe4e003fc /kernel/irq/chip.c
parenta77c4635915021c646cc017f22239e66d1aab4d5 (diff)
genirq: Provide compat handling for bus_lock/bus_sync_unlock
Wrap the old chip functions for bus_lock/bus_sync_unlock until the migration is complete and the old chip functions are removed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20100927121841.842536121@linutronix.de> Reviewed-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index e0e93ff10afd..77e551d92239 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -324,6 +324,17 @@ static void default_shutdown(unsigned int irq)
324 desc->status |= IRQ_MASKED; 324 desc->status |= IRQ_MASKED;
325} 325}
326 326
327/* Temporary migration helpers */
328static void compat_bus_lock(struct irq_data *data)
329{
330 data->chip->bus_lock(data->irq);
331}
332
333static void compat_bus_sync_unlock(struct irq_data *data)
334{
335 data->chip->bus_sync_unlock(data->irq);
336}
337
327/* 338/*
328 * Fixup enable/disable function pointers 339 * Fixup enable/disable function pointers
329 */ 340 */
@@ -346,6 +357,11 @@ void irq_chip_set_defaults(struct irq_chip *chip)
346 chip->disable : default_shutdown; 357 chip->disable : default_shutdown;
347 if (!chip->end) 358 if (!chip->end)
348 chip->end = dummy_irq_chip.end; 359 chip->end = dummy_irq_chip.end;
360
361 if (chip->bus_lock)
362 chip->irq_bus_lock = compat_bus_lock;
363 if (chip->bus_sync_unlock)
364 chip->irq_bus_sync_unlock = compat_bus_sync_unlock;
349} 365}
350 366
351static inline void mask_ack_irq(struct irq_desc *desc, int irq) 367static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@@ -687,7 +703,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
687 desc->irq_data.chip = &dummy_irq_chip; 703 desc->irq_data.chip = &dummy_irq_chip;
688 } 704 }
689 705
690 chip_bus_lock(irq, desc); 706 chip_bus_lock(desc);
691 raw_spin_lock_irqsave(&desc->lock, flags); 707 raw_spin_lock_irqsave(&desc->lock, flags);
692 708
693 /* Uninstall? */ 709 /* Uninstall? */
@@ -707,7 +723,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
707 desc->irq_data.chip->startup(irq); 723 desc->irq_data.chip->startup(irq);
708 } 724 }
709 raw_spin_unlock_irqrestore(&desc->lock, flags); 725 raw_spin_unlock_irqrestore(&desc->lock, flags);
710 chip_bus_sync_unlock(irq, desc); 726 chip_bus_sync_unlock(desc);
711} 727}
712EXPORT_SYMBOL_GPL(__set_irq_handler); 728EXPORT_SYMBOL_GPL(__set_irq_handler);
713 729