diff options
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/irq-mv6434x.c | 10 | ||||
| -rw-r--r-- | arch/mips/kernel/irq-rm7000.c | 7 | ||||
| -rw-r--r-- | arch/mips/kernel/irq-rm9000.c | 8 | ||||
| -rw-r--r-- | arch/mips/kernel/irq_cpu.c | 10 |
4 files changed, 0 insertions, 35 deletions
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index 6cfb31cafde2..efbd219845b5 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c | |||
| @@ -67,15 +67,6 @@ static inline void unmask_mv64340_irq(unsigned int irq) | |||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | /* | 69 | /* |
| 70 | * End IRQ processing | ||
| 71 | */ | ||
| 72 | static void end_mv64340_irq(unsigned int irq) | ||
| 73 | { | ||
| 74 | if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) | ||
| 75 | unmask_mv64340_irq(irq); | ||
| 76 | } | ||
| 77 | |||
| 78 | /* | ||
| 79 | * Interrupt handler for interrupts coming from the Marvell chip. | 70 | * Interrupt handler for interrupts coming from the Marvell chip. |
| 80 | * It could be built in ethernet ports etc... | 71 | * It could be built in ethernet ports etc... |
| 81 | */ | 72 | */ |
| @@ -106,7 +97,6 @@ struct irq_chip mv64340_irq_type = { | |||
| 106 | .mask = mask_mv64340_irq, | 97 | .mask = mask_mv64340_irq, |
| 107 | .mask_ack = mask_mv64340_irq, | 98 | .mask_ack = mask_mv64340_irq, |
| 108 | .unmask = unmask_mv64340_irq, | 99 | .unmask = unmask_mv64340_irq, |
| 109 | .end = end_mv64340_irq, | ||
| 110 | }; | 100 | }; |
| 111 | 101 | ||
| 112 | void __init mv64340_irq_init(unsigned int base) | 102 | void __init mv64340_irq_init(unsigned int base) |
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index ddcc2a5f8a06..123324ba8c14 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c | |||
| @@ -29,19 +29,12 @@ static inline void mask_rm7k_irq(unsigned int irq) | |||
| 29 | clear_c0_intcontrol(0x100 << (irq - irq_base)); | 29 | clear_c0_intcontrol(0x100 << (irq - irq_base)); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | static void rm7k_cpu_irq_end(unsigned int irq) | ||
| 33 | { | ||
| 34 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) | ||
| 35 | unmask_rm7k_irq(irq); | ||
| 36 | } | ||
| 37 | |||
| 38 | static struct irq_chip rm7k_irq_controller = { | 32 | static struct irq_chip rm7k_irq_controller = { |
| 39 | .typename = "RM7000", | 33 | .typename = "RM7000", |
| 40 | .ack = mask_rm7k_irq, | 34 | .ack = mask_rm7k_irq, |
| 41 | .mask = mask_rm7k_irq, | 35 | .mask = mask_rm7k_irq, |
| 42 | .mask_ack = mask_rm7k_irq, | 36 | .mask_ack = mask_rm7k_irq, |
| 43 | .unmask = unmask_rm7k_irq, | 37 | .unmask = unmask_rm7k_irq, |
| 44 | .end = rm7k_cpu_irq_end, | ||
| 45 | }; | 38 | }; |
| 46 | 39 | ||
| 47 | void __init rm7k_cpu_irq_init(int base) | 40 | void __init rm7k_cpu_irq_init(int base) |
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c index ba6440c88abd..0e6f4c5349d2 100644 --- a/arch/mips/kernel/irq-rm9000.c +++ b/arch/mips/kernel/irq-rm9000.c | |||
| @@ -80,19 +80,12 @@ static void rm9k_perfcounter_irq_shutdown(unsigned int irq) | |||
| 80 | on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1); | 80 | on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static void rm9k_cpu_irq_end(unsigned int irq) | ||
| 84 | { | ||
| 85 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) | ||
| 86 | unmask_rm9k_irq(irq); | ||
| 87 | } | ||
| 88 | |||
| 89 | static struct irq_chip rm9k_irq_controller = { | 83 | static struct irq_chip rm9k_irq_controller = { |
| 90 | .typename = "RM9000", | 84 | .typename = "RM9000", |
| 91 | .ack = mask_rm9k_irq, | 85 | .ack = mask_rm9k_irq, |
| 92 | .mask = mask_rm9k_irq, | 86 | .mask = mask_rm9k_irq, |
| 93 | .mask_ack = mask_rm9k_irq, | 87 | .mask_ack = mask_rm9k_irq, |
| 94 | .unmask = unmask_rm9k_irq, | 88 | .unmask = unmask_rm9k_irq, |
| 95 | .end = rm9k_cpu_irq_end, | ||
| 96 | }; | 89 | }; |
| 97 | 90 | ||
| 98 | static struct irq_chip rm9k_perfcounter_irq = { | 91 | static struct irq_chip rm9k_perfcounter_irq = { |
| @@ -103,7 +96,6 @@ static struct irq_chip rm9k_perfcounter_irq = { | |||
| 103 | .mask = mask_rm9k_irq, | 96 | .mask = mask_rm9k_irq, |
| 104 | .mask_ack = mask_rm9k_irq, | 97 | .mask_ack = mask_rm9k_irq, |
| 105 | .unmask = unmask_rm9k_irq, | 98 | .unmask = unmask_rm9k_irq, |
| 106 | .end = rm9k_cpu_irq_end, | ||
| 107 | }; | 99 | }; |
| 108 | 100 | ||
| 109 | unsigned int rm9000_perfcount_irq; | 101 | unsigned int rm9000_perfcount_irq; |
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c index be5ac23d3812..fcc86b96ccf6 100644 --- a/arch/mips/kernel/irq_cpu.c +++ b/arch/mips/kernel/irq_cpu.c | |||
| @@ -50,12 +50,6 @@ static inline void mask_mips_irq(unsigned int irq) | |||
| 50 | irq_disable_hazard(); | 50 | irq_disable_hazard(); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | static void mips_cpu_irq_end(unsigned int irq) | ||
| 54 | { | ||
| 55 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) | ||
| 56 | unmask_mips_irq(irq); | ||
| 57 | } | ||
| 58 | |||
| 59 | static struct irq_chip mips_cpu_irq_controller = { | 53 | static struct irq_chip mips_cpu_irq_controller = { |
| 60 | .typename = "MIPS", | 54 | .typename = "MIPS", |
| 61 | .ack = mask_mips_irq, | 55 | .ack = mask_mips_irq, |
| @@ -63,7 +57,6 @@ static struct irq_chip mips_cpu_irq_controller = { | |||
| 63 | .mask_ack = mask_mips_irq, | 57 | .mask_ack = mask_mips_irq, |
| 64 | .unmask = unmask_mips_irq, | 58 | .unmask = unmask_mips_irq, |
| 65 | .eoi = unmask_mips_irq, | 59 | .eoi = unmask_mips_irq, |
| 66 | .end = mips_cpu_irq_end, | ||
| 67 | }; | 60 | }; |
| 68 | 61 | ||
| 69 | /* | 62 | /* |
| @@ -96,8 +89,6 @@ static void mips_mt_cpu_irq_ack(unsigned int irq) | |||
| 96 | mask_mips_mt_irq(irq); | 89 | mask_mips_mt_irq(irq); |
| 97 | } | 90 | } |
| 98 | 91 | ||
| 99 | #define mips_mt_cpu_irq_end mips_cpu_irq_end | ||
| 100 | |||
| 101 | static struct irq_chip mips_mt_cpu_irq_controller = { | 92 | static struct irq_chip mips_mt_cpu_irq_controller = { |
| 102 | .typename = "MIPS", | 93 | .typename = "MIPS", |
| 103 | .startup = mips_mt_cpu_irq_startup, | 94 | .startup = mips_mt_cpu_irq_startup, |
| @@ -106,7 +97,6 @@ static struct irq_chip mips_mt_cpu_irq_controller = { | |||
| 106 | .mask_ack = mips_mt_cpu_irq_ack, | 97 | .mask_ack = mips_mt_cpu_irq_ack, |
| 107 | .unmask = unmask_mips_mt_irq, | 98 | .unmask = unmask_mips_mt_irq, |
| 108 | .eoi = unmask_mips_mt_irq, | 99 | .eoi = unmask_mips_mt_irq, |
| 109 | .end = mips_mt_cpu_irq_end, | ||
| 110 | }; | 100 | }; |
| 111 | 101 | ||
| 112 | void __init mips_cpu_irq_init(int irq_base) | 102 | void __init mips_cpu_irq_init(int irq_base) |
