diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-27 08:45:38 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-04 06:43:44 -0400 |
commit | 37e12df709f09eac17314d79a52190ac46746e33 (patch) | |
tree | 78159578101faddef22c5b13ccc200542cb3d2b6 /kernel/irq/autoprobe.c | |
parent | bc310dda41be6439364c8f3b9fe7c9d743d22b1c (diff) |
genirq: Provide compat handling for chip->startup()
Wrap the old chip function startup() 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: <20100927121842.635152961@linutronix.de>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r-- | kernel/irq/autoprobe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index 95806a45be78..7a468254e533 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c | |||
@@ -59,7 +59,7 @@ unsigned long probe_irq_on(void) | |||
59 | */ | 59 | */ |
60 | if (desc->irq_data.chip->set_type) | 60 | if (desc->irq_data.chip->set_type) |
61 | desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE); | 61 | desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE); |
62 | desc->irq_data.chip->startup(i); | 62 | desc->irq_data.chip->irq_startup(&desc->irq_data); |
63 | } | 63 | } |
64 | raw_spin_unlock_irq(&desc->lock); | 64 | raw_spin_unlock_irq(&desc->lock); |
65 | } | 65 | } |
@@ -76,7 +76,7 @@ unsigned long probe_irq_on(void) | |||
76 | raw_spin_lock_irq(&desc->lock); | 76 | raw_spin_lock_irq(&desc->lock); |
77 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { | 77 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { |
78 | desc->status |= IRQ_AUTODETECT | IRQ_WAITING; | 78 | desc->status |= IRQ_AUTODETECT | IRQ_WAITING; |
79 | if (desc->irq_data.chip->startup(i)) | 79 | if (desc->irq_data.chip->irq_startup(&desc->irq_data)) |
80 | desc->status |= IRQ_PENDING; | 80 | desc->status |= IRQ_PENDING; |
81 | } | 81 | } |
82 | raw_spin_unlock_irq(&desc->lock); | 82 | raw_spin_unlock_irq(&desc->lock); |