1 --- a/arch/mips/adm8668/irq.c
2 +++ b/arch/mips/adm8668/irq.c
8 -void enable_adm8668_irq(unsigned int irq);
9 -void disable_adm8668_irq(unsigned int irq);
10 -void adm8668_irq_cascade(void);
12 -void plat_irq_dispatch(void)
14 - unsigned int pending;
16 - pending = read_c0_cause() & read_c0_status() & ST0_IM;
18 - /* timer interrupt, that we renumbered */
19 - if (pending & STATUSF_IP7)
20 - do_IRQ(MIPS_CPU_IRQ_BASE + 7);
21 - if (pending & STATUSF_IP2)
22 - adm8668_irq_cascade();
26 - * System irq dispatch
28 -void adm8668_irq_cascade()
29 +static void adm8668_irq_cascade(void)
33 @@ -53,49 +32,53 @@ void adm8668_irq_cascade()
38 + * System irq dispatch
40 -static __inline void _irq_enable(int irql)
41 +void plat_irq_dispatch(void)
43 - ADM8668_INTC_REG(IRQ_ENABLE_REG) = (1 << irql);
45 + unsigned int pending;
47 + pending = read_c0_cause() & read_c0_status() & ST0_IM;
52 -static __inline void _irq_disable(int irql)
54 - ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irql);
55 + /* timer interrupt, that we renumbered */
56 + if (pending & STATUSF_IP7)
57 + do_IRQ(MIPS_CPU_IRQ_BASE + 7);
58 + if (pending & STATUSF_IP2)
59 + adm8668_irq_cascade();
66 -void enable_adm8668_irq(unsigned int irq)
67 +static void enable_adm8668_irq(struct irq_data *d)
71 if ((irq < 0) || (irq > NR_IRQS))
75 + ADM8668_INTC_REG(IRQ_ENABLE_REG) = (1 << irq);
82 -void disable_adm8668_irq(unsigned int irq)
83 +static void disable_adm8668_irq(struct irq_data *d)
87 if ((irq < 0) || (irq > NR_IRQS))
91 + ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq);
94 -static inline void ack_adm8668_irq(unsigned int irq_nr)
95 +static void ack_adm8668_irq(struct irq_data *d)
97 - ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq_nr);
100 + ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq);
104 @@ -104,20 +87,20 @@ static inline void ack_adm8668_irq(unsig
106 static struct irq_chip adm8668_irq_type = {
108 - .ack = ack_adm8668_irq,
109 - .mask = disable_adm8668_irq,
110 - .unmask = enable_adm8668_irq
111 + .irq_ack = ack_adm8668_irq,
112 + .irq_mask = disable_adm8668_irq,
113 + .irq_unmask = enable_adm8668_irq
119 -void __init init_adm8668_irqs(void)
120 +static void __init init_adm8668_irqs(void)
124 for (i = 0; i <= INT_LVL_MAX; i++)
125 - set_irq_chip_and_handler(i, &adm8668_irq_type,
126 + irq_set_chip_and_handler(i, &adm8668_irq_type,
129 /* hw0 is where our interrupts are uh.. interrupted at. */