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/handle.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/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 60e25c46eb55..8d0697f892a2 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -311,11 +311,6 @@ static unsigned int noop_ret(struct irq_data *data) | |||
311 | 311 | ||
312 | static void compat_noop(unsigned int irq) { } | 312 | static void compat_noop(unsigned int irq) { } |
313 | 313 | ||
314 | static unsigned int compat_noop_ret(unsigned int irq) | ||
315 | { | ||
316 | return 0; | ||
317 | } | ||
318 | |||
319 | /* | 314 | /* |
320 | * Generic no controller implementation | 315 | * Generic no controller implementation |
321 | */ | 316 | */ |
@@ -326,7 +321,6 @@ struct irq_chip no_irq_chip = { | |||
326 | .irq_enable = noop, | 321 | .irq_enable = noop, |
327 | .irq_disable = noop, | 322 | .irq_disable = noop, |
328 | .irq_ack = ack_bad, | 323 | .irq_ack = ack_bad, |
329 | .startup = compat_noop_ret, | ||
330 | .end = compat_noop, | 324 | .end = compat_noop, |
331 | }; | 325 | }; |
332 | 326 | ||
@@ -343,7 +337,6 @@ struct irq_chip dummy_irq_chip = { | |||
343 | .irq_ack = noop, | 337 | .irq_ack = noop, |
344 | .irq_mask = noop, | 338 | .irq_mask = noop, |
345 | .irq_unmask = noop, | 339 | .irq_unmask = noop, |
346 | .startup = compat_noop_ret, | ||
347 | .end = compat_noop, | 340 | .end = compat_noop, |
348 | }; | 341 | }; |
349 | 342 | ||