7 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 91ffb1233cad..ea36c8e8852c 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -51,7 +51,7 @@ static unsigned int startup_8259A_irq(unsigned int irq)
        return 0; /* never anything pending */
 }
-static struct hw_interrupt_type i8259A_irq_type = {
+static struct irq_chip i8259A_irq_type = {
        .typename = "XT-PIC",
        .startup = startup_8259A_irq,
        .shutdown = shutdown_8259A_irq,
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index f8cd1ac64d88..63dfeb41796b 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -137,7 +137,7 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set)
 #define shutdown_msc_irq        disable_msc_irq
-struct hw_interrupt_type msc_levelirq_type = {
+struct irq_chip msc_levelirq_type = {
        .typename = "SOC-it-Level",
        .startup = startup_msc_irq,
        .shutdown = shutdown_msc_irq,
@@ -147,7 +147,7 @@ struct hw_interrupt_type msc_levelirq_type = {
        .end = end_msc_irq,
 };
-struct hw_interrupt_type msc_edgeirq_type = {
+struct irq_chip msc_edgeirq_type = {
        .typename = "SOC-it-Edge",
        .startup =startup_msc_irq,
        .shutdown = shutdown_msc_irq,
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c
index f9c763a65547..b117e64da64d 100644
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -136,7 +136,7 @@ void ll_mv64340_irq(struct pt_regs *regs)
 #define shutdown_mv64340_irq    disable_mv64340_irq
-struct hw_interrupt_type mv64340_irq_type = {
+struct irq_chip mv64340_irq_type = {
        .typename = "MV-64340",
        .startup = startup_mv64340_irq,
        .shutdown = shutdown_mv64340_irq,
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index 121da385a94d..6b54c7109e2e 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -71,7 +71,7 @@ static void rm7k_cpu_irq_end(unsigned int irq)
                unmask_rm7k_irq(irq);
 }
-static hw_irq_controller rm7k_irq_controller = {
+static struct irq_chip rm7k_irq_controller = {
        .typename = "RM7000",
        .startup = rm7k_cpu_irq_startup,
        .shutdown = rm7k_cpu_irq_shutdown,
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index 25109c103e44..62f011ba97a2 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -105,7 +105,7 @@ static void rm9k_cpu_irq_end(unsigned int irq)
                unmask_rm9k_irq(irq);
 }
-static hw_irq_controller rm9k_irq_controller = {
+static struct irq_chip rm9k_irq_controller = {
        .typename = "RM9000",
        .startup = rm9k_cpu_irq_startup,
        .shutdown = rm9k_cpu_irq_shutdown,
@@ -115,7 +115,7 @@ static hw_irq_controller rm9k_irq_controller = {
        .end = rm9k_cpu_irq_end,
 };
-static hw_irq_controller rm9k_perfcounter_irq = {
+static struct irq_chip rm9k_perfcounter_irq = {
        .typename = "RM9000",
        .startup = rm9k_perfcounter_irq_startup,
        .shutdown = rm9k_perfcounter_irq_shutdown,
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index cde5e5afa179..d955aaefbb8e 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -136,7 +136,7 @@ void __init init_IRQ(void)
                irq_desc[i].status  = IRQ_DISABLED;
                irq_desc[i].action  = NULL;
                irq_desc[i].depth   = 1;
-                irq_desc[i].chip = &no_irq_type;
+                irq_desc[i].chip = &no_irq_chip;
                spin_lock_init(&irq_desc[i].lock);
 #ifdef CONFIG_MIPS_MT_SMTC
                irq_hwmask[i] = 0;
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 0e455a8ad860..9bb21c7f2149 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -94,7 +94,7 @@ static void mips_cpu_irq_end(unsigned int irq)
                unmask_mips_irq(irq);
 }
-static hw_irq_controller mips_cpu_irq_controller = {
+static struct irq_chip mips_cpu_irq_controller = {
        .typename       = "MIPS",
        .startup        = mips_cpu_irq_startup,
        .shutdown       = mips_cpu_irq_shutdown,
@@ -140,7 +140,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)
 #define mips_mt_cpu_irq_end mips_cpu_irq_end
-static hw_irq_controller mips_mt_cpu_irq_controller = {
+static struct irq_chip mips_mt_cpu_irq_controller = {
        .typename       = "MIPS",
        .startup        = mips_mt_cpu_irq_startup,
        .shutdown       = mips_mt_cpu_irq_shutdown,

diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index 91ffb1233cad..ea36c8e8852c 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c
@@ -51,7 +51,7 @@ static unsigned int startup_8259A_irq(unsigned int irq)
51	return 0; /* never anything pending */	51	return 0; /* never anything pending */
52	}	52	}
53		53
54	static struct hw_interrupt_type i8259A_irq_type = {	54	static struct irq_chip i8259A_irq_type = {
55	.typename = "XT-PIC",	55	.typename = "XT-PIC",
56	.startup = startup_8259A_irq,	56	.startup = startup_8259A_irq,
57	.shutdown = shutdown_8259A_irq,	57	.shutdown = shutdown_8259A_irq,


diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c index f8cd1ac64d88..63dfeb41796b 100644 --- a/arch/mips/kernel/irq-msc01.c +++ b/arch/mips/kernel/irq-msc01.c
@@ -137,7 +137,7 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set)
137		137
138	#define shutdown_msc_irq disable_msc_irq	138	#define shutdown_msc_irq disable_msc_irq
139		139
140	struct hw_interrupt_type msc_levelirq_type = {	140	struct irq_chip msc_levelirq_type = {
141	.typename = "SOC-it-Level",	141	.typename = "SOC-it-Level",
142	.startup = startup_msc_irq,	142	.startup = startup_msc_irq,
143	.shutdown = shutdown_msc_irq,	143	.shutdown = shutdown_msc_irq,
@@ -147,7 +147,7 @@ struct hw_interrupt_type msc_levelirq_type = {
147	.end = end_msc_irq,	147	.end = end_msc_irq,
148	};	148	};
149		149
150	struct hw_interrupt_type msc_edgeirq_type = {	150	struct irq_chip msc_edgeirq_type = {
151	.typename = "SOC-it-Edge",	151	.typename = "SOC-it-Edge",
152	.startup =startup_msc_irq,	152	.startup =startup_msc_irq,
153	.shutdown = shutdown_msc_irq,	153	.shutdown = shutdown_msc_irq,


diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index f9c763a65547..b117e64da64d 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c
@@ -136,7 +136,7 @@ void ll_mv64340_irq(struct pt_regs *regs)
136		136
137	#define shutdown_mv64340_irq disable_mv64340_irq	137	#define shutdown_mv64340_irq disable_mv64340_irq
138		138
139	struct hw_interrupt_type mv64340_irq_type = {	139	struct irq_chip mv64340_irq_type = {
140	.typename = "MV-64340",	140	.typename = "MV-64340",
141	.startup = startup_mv64340_irq,	141	.startup = startup_mv64340_irq,
142	.shutdown = shutdown_mv64340_irq,	142	.shutdown = shutdown_mv64340_irq,


diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index 121da385a94d..6b54c7109e2e 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c
@@ -71,7 +71,7 @@ static void rm7k_cpu_irq_end(unsigned int irq)
71	unmask_rm7k_irq(irq);	71	unmask_rm7k_irq(irq);
72	}	72	}
73		73
74	static hw_irq_controller rm7k_irq_controller = {	74	static struct irq_chip rm7k_irq_controller = {
75	.typename = "RM7000",	75	.typename = "RM7000",
76	.startup = rm7k_cpu_irq_startup,	76	.startup = rm7k_cpu_irq_startup,
77	.shutdown = rm7k_cpu_irq_shutdown,	77	.shutdown = rm7k_cpu_irq_shutdown,


diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c index 25109c103e44..62f011ba97a2 100644 --- a/arch/mips/kernel/irq-rm9000.c +++ b/arch/mips/kernel/irq-rm9000.c
@@ -105,7 +105,7 @@ static void rm9k_cpu_irq_end(unsigned int irq)
105	unmask_rm9k_irq(irq);	105	unmask_rm9k_irq(irq);
106	}	106	}
107		107
108	static hw_irq_controller rm9k_irq_controller = {	108	static struct irq_chip rm9k_irq_controller = {
109	.typename = "RM9000",	109	.typename = "RM9000",
110	.startup = rm9k_cpu_irq_startup,	110	.startup = rm9k_cpu_irq_startup,
111	.shutdown = rm9k_cpu_irq_shutdown,	111	.shutdown = rm9k_cpu_irq_shutdown,
@@ -115,7 +115,7 @@ static hw_irq_controller rm9k_irq_controller = {
115	.end = rm9k_cpu_irq_end,	115	.end = rm9k_cpu_irq_end,
116	};	116	};
117		117
118	static hw_irq_controller rm9k_perfcounter_irq = {	118	static struct irq_chip rm9k_perfcounter_irq = {
119	.typename = "RM9000",	119	.typename = "RM9000",
120	.startup = rm9k_perfcounter_irq_startup,	120	.startup = rm9k_perfcounter_irq_startup,
121	.shutdown = rm9k_perfcounter_irq_shutdown,	121	.shutdown = rm9k_perfcounter_irq_shutdown,


diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index cde5e5afa179..d955aaefbb8e 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c
@@ -136,7 +136,7 @@ void __init init_IRQ(void)
136	irq_desc[i].status = IRQ_DISABLED;	136	irq_desc[i].status = IRQ_DISABLED;
137	irq_desc[i].action = NULL;	137	irq_desc[i].action = NULL;
138	irq_desc[i].depth = 1;	138	irq_desc[i].depth = 1;
139	irq_desc[i].chip = &no_irq_type;	139	irq_desc[i].chip = &no_irq_chip;
140	spin_lock_init(&irq_desc[i].lock);	140	spin_lock_init(&irq_desc[i].lock);
141	#ifdef CONFIG_MIPS_MT_SMTC	141	#ifdef CONFIG_MIPS_MT_SMTC
142	irq_hwmask[i] = 0;	142	irq_hwmask[i] = 0;


diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c index 0e455a8ad860..9bb21c7f2149 100644 --- a/arch/mips/kernel/irq_cpu.c +++ b/arch/mips/kernel/irq_cpu.c
@@ -94,7 +94,7 @@ static void mips_cpu_irq_end(unsigned int irq)
94	unmask_mips_irq(irq);	94	unmask_mips_irq(irq);
95	}	95	}
96		96
97	static hw_irq_controller mips_cpu_irq_controller = {	97	static struct irq_chip mips_cpu_irq_controller = {
98	.typename = "MIPS",	98	.typename = "MIPS",
99	.startup = mips_cpu_irq_startup,	99	.startup = mips_cpu_irq_startup,
100	.shutdown = mips_cpu_irq_shutdown,	100	.shutdown = mips_cpu_irq_shutdown,
@@ -140,7 +140,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)
140		140
141	#define mips_mt_cpu_irq_end mips_cpu_irq_end	141	#define mips_mt_cpu_irq_end mips_cpu_irq_end
142		142
143	static hw_irq_controller mips_mt_cpu_irq_controller = {	143	static struct irq_chip mips_mt_cpu_irq_controller = {
144	.typename = "MIPS",	144	.typename = "MIPS",
145	.startup = mips_mt_cpu_irq_startup,	145	.startup = mips_mt_cpu_irq_startup,
146	.shutdown = mips_mt_cpu_irq_shutdown,	146	.shutdown = mips_mt_cpu_irq_shutdown,