Commit 4e45171c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ralf Baechle

[MIPS] cleanup struct irqaction initializers

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1c0c13eb
...@@ -92,7 +92,9 @@ asmlinkage void plat_irq_dispatch(void) ...@@ -92,7 +92,9 @@ asmlinkage void plat_irq_dispatch(void)
} }
static struct irqaction irq_via = { static struct irqaction irq_via = {
no_action, 0, { { 0, } }, "cascade", NULL, NULL .handler = no_action,
.mask = CPU_MASK_NONE,
.name = "cascade"
}; };
void __init arch_init_irq(void) void __init arch_init_irq(void)
......
...@@ -104,7 +104,9 @@ static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id) ...@@ -104,7 +104,9 @@ static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id)
} }
static struct irqaction ioc_action = { static struct irqaction ioc_action = {
jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, .handler = jmr3927_ioc_interrupt,
.mask = CPU_MASK_NONE,
.name = "IOC",
}; };
static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id) static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
...@@ -116,7 +118,9 @@ static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id) ...@@ -116,7 +118,9 @@ static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct irqaction pcierr_action = { static struct irqaction pcierr_action = {
jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, .handler = jmr3927_pcierr_interrupt,
.mask = CPU_MASK_NONE,
.name = "PCI error",
}; };
static void __init jmr3927_irq_init(void); static void __init jmr3927_irq_init(void);
......
...@@ -303,7 +303,9 @@ void init_8259A(int auto_eoi) ...@@ -303,7 +303,9 @@ void init_8259A(int auto_eoi)
* IRQ2 is cascade interrupt to second interrupt controller * IRQ2 is cascade interrupt to second interrupt controller
*/ */
static struct irqaction irq2 = { static struct irqaction irq2 = {
no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL .handler = no_action,
.mask = CPU_MASK_NONE,
.name = "cascade",
}; };
static struct resource pic1_io_resource = { static struct resource pic1_io_resource = {
......
...@@ -117,10 +117,18 @@ static void inline flush_mace_bus(void) ...@@ -117,10 +117,18 @@ static void inline flush_mace_bus(void)
extern irqreturn_t crime_memerr_intr(int irq, void *dev_id); extern irqreturn_t crime_memerr_intr(int irq, void *dev_id);
extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id); extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
struct irqaction memerr_irq = { crime_memerr_intr, IRQF_DISABLED, struct irqaction memerr_irq = {
CPU_MASK_NONE, "CRIME memory error", NULL, NULL }; .handler = crime_memerr_intr,
struct irqaction cpuerr_irq = { crime_cpuerr_intr, IRQF_DISABLED, .flags = IRQF_DISABLED,
CPU_MASK_NONE, "CRIME CPU error", NULL, NULL }; .mask = CPU_MASK_NONE,
.name = "CRIME memory error",
};
struct irqaction cpuerr_irq = {
.handler = crime_cpuerr_intr,
.flags = IRQF_DISABLED,
.mask = CPU_MASK_NONE,
.name = "CRIME CPU error",
};
/* /*
* For interrupts wired from a single device to the CPU. Only the clock * For interrupts wired from a single device to the CPU. Only the clock
......
...@@ -243,10 +243,12 @@ int toshiba_rbtx4927_irq_nested(int sw_irq) ...@@ -243,10 +243,12 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
return (sw_irq); return (sw_irq);
} }
//#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } static struct irqaction toshiba_rbtx4927_irq_ioc_action = {
#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL } .handler = no_action,
static struct irqaction toshiba_rbtx4927_irq_ioc_action = .flags = IRQF_SHARED,
TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); .mask = CPU_MASK_NONE,
.name = TOSHIBA_RBTX4927_IOC_NAME
};
/**********************************************************************************/ /**********************************************************************************/
......
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