Commit 94dee171 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Eleminate interrupt migration helper use.



> #define hw_interrupt_type       irq_chip
> typedef struct irq_chip         hw_irq_controller;
> #define no_irq_type             no_irq_chip
> typedef struct irq_desc         irq_desc_t;
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e1e80b4d
......@@ -251,7 +251,7 @@ void restore_local_and_enable(int controller, unsigned long mask)
}
static struct hw_interrupt_type rise_edge_irq_type = {
static struct irq_chip rise_edge_irq_type = {
.typename = "Au1000 Rise Edge",
.startup = startup_irq,
.shutdown = shutdown_irq,
......@@ -261,7 +261,7 @@ static struct hw_interrupt_type rise_edge_irq_type = {
.end = end_irq,
};
static struct hw_interrupt_type fall_edge_irq_type = {
static struct irq_chip fall_edge_irq_type = {
.typename = "Au1000 Fall Edge",
.startup = startup_irq,
.shutdown = shutdown_irq,
......@@ -271,7 +271,7 @@ static struct hw_interrupt_type fall_edge_irq_type = {
.end = end_irq,
};
static struct hw_interrupt_type either_edge_irq_type = {
static struct irq_chip either_edge_irq_type = {
.typename = "Au1000 Rise or Fall Edge",
.startup = startup_irq,
.shutdown = shutdown_irq,
......@@ -281,7 +281,7 @@ static struct hw_interrupt_type either_edge_irq_type = {
.end = end_irq,
};
static struct hw_interrupt_type level_irq_type = {
static struct irq_chip level_irq_type = {
.typename = "Au1000 Level",
.startup = startup_irq,
.shutdown = shutdown_irq,
......
......@@ -148,7 +148,7 @@ static void pb1200_end_irq(unsigned int irq_nr)
}
}
static struct hw_interrupt_type external_irq_type =
static struct irq_chip external_irq_type =
{
#ifdef CONFIG_MIPS_PB1200
"Pb1200 Ext",
......
......@@ -89,7 +89,7 @@ vrc5477_irq_end(unsigned int irq)
ll_vrc5477_irq_enable( irq - vrc5477_irq_base);
}
hw_irq_controller vrc5477_irq_controller = {
struct irq_chip vrc5477_irq_controller = {
.typename = "vrc5477_irq",
.startup = vrc5477_irq_startup,
.shutdown = vrc5477_irq_shutdown,
......
......@@ -93,7 +93,7 @@ static inline void end_ioasic_irq(unsigned int irq)
enable_ioasic_irq(irq);
}
static struct hw_interrupt_type ioasic_irq_type = {
static struct irq_chip ioasic_irq_type = {
.typename = "IO-ASIC",
.startup = startup_ioasic_irq,
.shutdown = shutdown_ioasic_irq,
......@@ -121,7 +121,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq)
end_ioasic_irq(irq);
}
static struct hw_interrupt_type ioasic_dma_irq_type = {
static struct irq_chip ioasic_dma_irq_type = {
.typename = "IO-ASIC-DMA",
.startup = startup_ioasic_dma_irq,
.shutdown = shutdown_ioasic_dma_irq,
......
......@@ -94,7 +94,7 @@ static void end_kn02_irq(unsigned int irq)
enable_kn02_irq(irq);
}
static struct hw_interrupt_type kn02_irq_type = {
static struct irq_chip kn02_irq_type = {
.typename = "KN02-CSR",
.startup = startup_kn02_irq,
.shutdown = shutdown_kn02_irq,
......
......@@ -78,7 +78,7 @@ static void emma2rh_irq_end(unsigned int irq)
ll_emma2rh_irq_enable(irq - emma2rh_irq_base);
}
hw_irq_controller emma2rh_irq_controller = {
struct irq_chip emma2rh_irq_controller = {
.typename = "emma2rh_irq",
.startup = emma2rh_irq_startup,
.shutdown = emma2rh_irq_shutdown,
......
......@@ -67,7 +67,7 @@ static void emma2rh_sw_irq_end(unsigned int irq)
ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base);
}
hw_irq_controller emma2rh_sw_irq_controller = {
struct irq_chip emma2rh_sw_irq_controller = {
.typename = "emma2rh_sw_irq",
.startup = emma2rh_sw_irq_startup,
.shutdown = emma2rh_sw_irq_shutdown,
......@@ -147,7 +147,7 @@ static void emma2rh_gpio_irq_end(unsigned int irq)
ll_emma2rh_gpio_irq_enable(irq - emma2rh_gpio_irq_base);
}
hw_irq_controller emma2rh_gpio_irq_controller = {
struct irq_chip emma2rh_gpio_irq_controller = {
.typename = "emma2rh_gpio_irq",
.startup = emma2rh_gpio_irq_startup,
.shutdown = emma2rh_gpio_irq_shutdown,
......
......@@ -104,7 +104,7 @@ static void end_ev64120_irq(unsigned int irq)
enable_ev64120_irq(irq);
}
static struct hw_interrupt_type ev64120_irq_type = {
static struct irq_chip ev64120_irq_type = {
.typename = "EV64120",
.startup = startup_ev64120_irq,
.shutdown = shutdown_ev64120_irq,
......@@ -138,7 +138,7 @@ void __init arch_init_irq(void)
/* Let's initialize our IRQ descriptors */
for (i = 0; i < NR_IRQS; i++) {
irq_desc[i].status = 0;
irq_desc[i].chip = &no_irq_type;
irq_desc[i].chip = &no_irq_chip;
irq_desc[i].action = NULL;
irq_desc[i].depth = 0;
spin_lock_init(&irq_desc[i].lock);
......
......@@ -133,7 +133,7 @@ static void end_ite_irq(unsigned int irq)
enable_it8172_irq(irq);
}
static struct hw_interrupt_type it8172_irq_type = {
static struct irq_chip it8172_irq_type = {
.typename = "ITE8172",
.startup = startup_ite_irq,
.shutdown = shutdown_ite_irq,
......@@ -153,7 +153,7 @@ static void ack_none(unsigned int irq) { }
#define shutdown_none disable_none
#define end_none enable_none
static struct hw_interrupt_type cp0_irq_type = {
static struct irq_chip cp0_irq_type = {
.typename = "CP0 Count",
.startup = startup_none,
.shutdown = shutdown_none,
......
......@@ -55,7 +55,7 @@ static void end_r4030_irq(unsigned int irq)
enable_r4030_irq(irq);
}
static struct hw_interrupt_type r4030_irq_type = {
static struct irq_chip r4030_irq_type = {
.typename = "R4030",
.startup = startup_r4030_irq,
.shutdown = shutdown_r4030_irq,
......
......@@ -416,7 +416,7 @@ void __init arch_init_irq(void)
set_c0_status(ST0_IM); /* IE bit is still 0. */
}
static hw_irq_controller jmr3927_irq_controller = {
static struct irq_chip jmr3927_irq_controller = {
.typename = "jmr3927_irq",
.startup = jmr3927_irq_startup,
.shutdown = jmr3927_irq_shutdown,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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;
......
......@@ -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,
......
......@@ -69,7 +69,7 @@ static void end_lasat_irq(unsigned int irq)
enable_lasat_irq(irq);
}
static struct hw_interrupt_type lasat_irq_type = {
static struct irq_chip lasat_irq_type = {
.typename = "Lasat",
.startup = startup_lasat_irq,
.shutdown = shutdown_lasat_irq,
......
......@@ -73,7 +73,7 @@ static void end_atlas_irq(unsigned int irq)
enable_atlas_irq(irq);
}
static struct hw_interrupt_type atlas_irq_type = {
static struct irq_chip atlas_irq_type = {
.typename = "Atlas",
.startup = startup_atlas_irq,
.shutdown = shutdown_atlas_irq,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment