diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-14 14:16:43 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:23 -0500 |
commit | 091738a266fc74329ae186f22ff2b3f01319112d (patch) | |
tree | 75190438b74ad345753a2a8c239724995cee40ea | |
parent | a6967caf00ebbb2d4acdebcb72a25f2e9ba43fd2 (diff) |
genirq: Remove real old transition functions
These transition helpers are stale for years now. Remove them.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | kernel/irq/autoprobe.c | 6 | ||||
-rw-r--r-- | kernel/irq/chip.c | 16 | ||||
-rw-r--r-- | kernel/irq/internals.h | 3 | ||||
-rw-r--r-- | kernel/irq/manage.c | 14 |
4 files changed, 5 insertions, 34 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index c8bbc4fabaab..394784c57060 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c | |||
@@ -47,12 +47,6 @@ unsigned long probe_irq_on(void) | |||
47 | raw_spin_lock_irq(&desc->lock); | 47 | raw_spin_lock_irq(&desc->lock); |
48 | if (!desc->action && irq_settings_can_probe(desc)) { | 48 | if (!desc->action && irq_settings_can_probe(desc)) { |
49 | /* | 49 | /* |
50 | * An old-style architecture might still have | ||
51 | * the handle_bad_irq handler there: | ||
52 | */ | ||
53 | compat_irq_chip_set_default_handler(desc); | ||
54 | |||
55 | /* | ||
56 | * Some chips need to know about probing in | 50 | * Some chips need to know about probing in |
57 | * progress: | 51 | * progress: |
58 | */ | 52 | */ |
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 2b0f9192a830..c19c0b562c80 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -644,19 +644,11 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained, | |||
644 | return; | 644 | return; |
645 | } | 645 | } |
646 | 646 | ||
647 | if (!handle) | 647 | if (!handle) { |
648 | handle = handle_bad_irq; | 648 | handle = handle_bad_irq; |
649 | else if (desc->irq_data.chip == &no_irq_chip) { | 649 | } else { |
650 | printk(KERN_WARNING "Trying to install %sinterrupt handler " | 650 | if (WARN_ON(desc->irq_data.chip == &no_irq_chip)) |
651 | "for IRQ%d\n", is_chained ? "chained " : "", irq); | 651 | return; |
652 | /* | ||
653 | * Some ARM implementations install a handler for really dumb | ||
654 | * interrupt hardware without setting an irq_chip. This worked | ||
655 | * with the ARM no_irq_chip but the check in setup_irq would | ||
656 | * prevent us to setup the interrupt at all. Switch it to | ||
657 | * dummy_irq_chip for easy transition. | ||
658 | */ | ||
659 | desc->irq_data.chip = &dummy_irq_chip; | ||
660 | } | 652 | } |
661 | 653 | ||
662 | chip_bus_lock(desc); | 654 | chip_bus_lock(desc); |
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index fd5777ab2d34..f80a77471617 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
@@ -74,9 +74,6 @@ enum { | |||
74 | /* Set default functions for irq_chip structures: */ | 74 | /* Set default functions for irq_chip structures: */ |
75 | extern void irq_chip_set_defaults(struct irq_chip *chip); | 75 | extern void irq_chip_set_defaults(struct irq_chip *chip); |
76 | 76 | ||
77 | /* Set default handler: */ | ||
78 | extern void compat_irq_chip_set_default_handler(struct irq_desc *desc); | ||
79 | |||
80 | extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, | 77 | extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, |
81 | unsigned long flags); | 78 | unsigned long flags); |
82 | extern void __disable_irq(struct irq_desc *desc, unsigned int irq, bool susp); | 79 | extern void __disable_irq(struct irq_desc *desc, unsigned int irq, bool susp); |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index ea6add6036b1..99395a24f432 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -540,17 +540,6 @@ int can_request_irq(unsigned int irq, unsigned long irqflags) | |||
540 | return !action; | 540 | return !action; |
541 | } | 541 | } |
542 | 542 | ||
543 | void compat_irq_chip_set_default_handler(struct irq_desc *desc) | ||
544 | { | ||
545 | /* | ||
546 | * If the architecture still has not overriden | ||
547 | * the flow handler then zap the default. This | ||
548 | * should catch incorrect flow-type setting. | ||
549 | */ | ||
550 | if (desc->handle_irq == &handle_bad_irq) | ||
551 | desc->handle_irq = NULL; | ||
552 | } | ||
553 | |||
554 | int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, | 543 | int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, |
555 | unsigned long flags) | 544 | unsigned long flags) |
556 | { | 545 | { |
@@ -912,8 +901,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) | |||
912 | 901 | ||
913 | if (ret) | 902 | if (ret) |
914 | goto out_mask; | 903 | goto out_mask; |
915 | } else | 904 | } |
916 | compat_irq_chip_set_default_handler(desc); | ||
917 | 905 | ||
918 | desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \ | 906 | desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \ |
919 | IRQS_INPROGRESS | IRQS_ONESHOT | \ | 907 | IRQS_INPROGRESS | IRQS_ONESHOT | \ |