s390/irq: use designated initializers for irq class array

Use designated initializers for the irq class array in irq.c so
it's always guaranteed that the order of elements is equal to
their corresponding parts in irq.h.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c1b4493..6cdc55b 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -30,35 +30,35 @@ struct irq_class {
 };
 
 static const struct irq_class intrclass_names[] = {
-       {.name = "EXT" },
-       {.name = "I/O" },
-       {.name = "CLK", .desc = "[EXT] Clock Comparator" },
-       {.name = "EXC", .desc = "[EXT] External Call" },
-       {.name = "EMS", .desc = "[EXT] Emergency Signal" },
-       {.name = "TMR", .desc = "[EXT] CPU Timer" },
-       {.name = "TAL", .desc = "[EXT] Timing Alert" },
-       {.name = "PFL", .desc = "[EXT] Pseudo Page Fault" },
-       {.name = "DSD", .desc = "[EXT] DASD Diag" },
-       {.name = "VRT", .desc = "[EXT] Virtio" },
-       {.name = "SCP", .desc = "[EXT] Service Call" },
-       {.name = "IUC", .desc = "[EXT] IUCV" },
-       {.name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling" },
-       {.name = "CMC", .desc = "[EXT] CPU-Measurement: Counter" },
-       {.name = "CMR", .desc = "[EXT] CPU-Measurement: RI" },
-       {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt" },
-       {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
-       {.name = "DAS", .desc = "[I/O] DASD" },
-       {.name = "C15", .desc = "[I/O] 3215" },
-       {.name = "C70", .desc = "[I/O] 3270" },
-       {.name = "TAP", .desc = "[I/O] Tape" },
-       {.name = "VMR", .desc = "[I/O] Unit Record Devices" },
-       {.name = "LCS", .desc = "[I/O] LCS" },
-       {.name = "CLW", .desc = "[I/O] CLAW" },
-       {.name = "CTC", .desc = "[I/O] CTC" },
-       {.name = "APB", .desc = "[I/O] AP Bus" },
-       {.name = "ADM", .desc = "[I/O] EADM Subchannel" },
-       {.name = "CSC", .desc = "[I/O] CHSC Subchannel" },
-       {.name = "NMI", .desc = "[NMI] Machine Check" },
+       [EXTERNAL_INTERRUPT] = {.name = "EXT"},
+       [IO_INTERRUPT]       = {.name = "I/O"},
+       [EXTINT_CLK] = {.name = "CLK", .desc = "[EXT] Clock Comparator"},
+       [EXTINT_EXC] = {.name = "EXC", .desc = "[EXT] External Call"},
+       [EXTINT_EMS] = {.name = "EMS", .desc = "[EXT] Emergency Signal"},
+       [EXTINT_TMR] = {.name = "TMR", .desc = "[EXT] CPU Timer"},
+       [EXTINT_TLA] = {.name = "TAL", .desc = "[EXT] Timing Alert"},
+       [EXTINT_PFL] = {.name = "PFL", .desc = "[EXT] Pseudo Page Fault"},
+       [EXTINT_DSD] = {.name = "DSD", .desc = "[EXT] DASD Diag"},
+       [EXTINT_VRT] = {.name = "VRT", .desc = "[EXT] Virtio"},
+       [EXTINT_SCP] = {.name = "SCP", .desc = "[EXT] Service Call"},
+       [EXTINT_IUC] = {.name = "IUC", .desc = "[EXT] IUCV"},
+       [EXTINT_CMS] = {.name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling"},
+       [EXTINT_CMC] = {.name = "CMC", .desc = "[EXT] CPU-Measurement: Counter"},
+       [EXTINT_CMR] = {.name = "CMR", .desc = "[EXT] CPU-Measurement: RI"},
+       [IOINT_CIO]  = {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt"},
+       [IOINT_QAI]  = {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt"},
+       [IOINT_DAS]  = {.name = "DAS", .desc = "[I/O] DASD"},
+       [IOINT_C15]  = {.name = "C15", .desc = "[I/O] 3215"},
+       [IOINT_C70]  = {.name = "C70", .desc = "[I/O] 3270"},
+       [IOINT_TAP]  = {.name = "TAP", .desc = "[I/O] Tape"},
+       [IOINT_VMR]  = {.name = "VMR", .desc = "[I/O] Unit Record Devices"},
+       [IOINT_LCS]  = {.name = "LCS", .desc = "[I/O] LCS"},
+       [IOINT_CLW]  = {.name = "CLW", .desc = "[I/O] CLAW"},
+       [IOINT_CTC]  = {.name = "CTC", .desc = "[I/O] CTC"},
+       [IOINT_APB]  = {.name = "APB", .desc = "[I/O] AP Bus"},
+       [IOINT_ADM]  = {.name = "ADM", .desc = "[I/O] EADM Subchannel"},
+       [IOINT_CSC]  = {.name = "CSC", .desc = "[I/O] CHSC Subchannel"},
+       [NMI_NMI]    = {.name = "NMI", .desc = "[NMI] Machine Check"},
 };
 
 /*