Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[MIPS] cleanup struct irqaction initializers

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Thomas Gleixner and committed by
Ralf Baechle
4e45171c 1c0c13eb

+30 -12
+3 -1
arch/mips/cobalt/irq.c
··· 92 92 } 93 93 94 94 static struct irqaction irq_via = { 95 - no_action, 0, { { 0, } }, "cascade", NULL, NULL 95 + .handler = no_action, 96 + .mask = CPU_MASK_NONE, 97 + .name = "cascade" 96 98 }; 97 99 98 100 void __init arch_init_irq(void)
+6 -2
arch/mips/jmr3927/rbhma3100/irq.c
··· 104 104 } 105 105 106 106 static struct irqaction ioc_action = { 107 - jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, 107 + .handler = jmr3927_ioc_interrupt, 108 + .mask = CPU_MASK_NONE, 109 + .name = "IOC", 108 110 }; 109 111 110 112 static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id) ··· 118 116 return IRQ_HANDLED; 119 117 } 120 118 static struct irqaction pcierr_action = { 121 - jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, 119 + .handler = jmr3927_pcierr_interrupt, 120 + .mask = CPU_MASK_NONE, 121 + .name = "PCI error", 122 122 }; 123 123 124 124 static void __init jmr3927_irq_init(void);
+3 -1
arch/mips/kernel/i8259.c
··· 303 303 * IRQ2 is cascade interrupt to second interrupt controller 304 304 */ 305 305 static struct irqaction irq2 = { 306 - no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL 306 + .handler = no_action, 307 + .mask = CPU_MASK_NONE, 308 + .name = "cascade", 307 309 }; 308 310 309 311 static struct resource pic1_io_resource = {
+12 -4
arch/mips/sgi-ip32/ip32-irq.c
··· 117 117 extern irqreturn_t crime_memerr_intr(int irq, void *dev_id); 118 118 extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id); 119 119 120 - struct irqaction memerr_irq = { crime_memerr_intr, IRQF_DISABLED, 121 - CPU_MASK_NONE, "CRIME memory error", NULL, NULL }; 122 - struct irqaction cpuerr_irq = { crime_cpuerr_intr, IRQF_DISABLED, 123 - CPU_MASK_NONE, "CRIME CPU error", NULL, NULL }; 120 + struct irqaction memerr_irq = { 121 + .handler = crime_memerr_intr, 122 + .flags = IRQF_DISABLED, 123 + .mask = CPU_MASK_NONE, 124 + .name = "CRIME memory error", 125 + }; 126 + struct irqaction cpuerr_irq = { 127 + .handler = crime_cpuerr_intr, 128 + .flags = IRQF_DISABLED, 129 + .mask = CPU_MASK_NONE, 130 + .name = "CRIME CPU error", 131 + }; 124 132 125 133 /* 126 134 * For interrupts wired from a single device to the CPU. Only the clock
+6 -4
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
··· 243 243 return (sw_irq); 244 244 } 245 245 246 - //#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } 247 - #define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL } 248 - static struct irqaction toshiba_rbtx4927_irq_ioc_action = 249 - TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); 246 + static struct irqaction toshiba_rbtx4927_irq_ioc_action = { 247 + .handler = no_action, 248 + .flags = IRQF_SHARED, 249 + .mask = CPU_MASK_NONE, 250 + .name = TOSHIBA_RBTX4927_IOC_NAME 251 + }; 250 252 251 253 252 254 /**********************************************************************************/