Commit 708c39db0ec8461c3ef1ac333ac7bb9f28833d5a

Authored by Heiko Carstens
Committed by Martin Schwidefsky
1 parent 41459d36cf

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>

Showing 1 changed file with 29 additions and 29 deletions Side-by-side Diff

arch/s390/kernel/irq.c
... ... @@ -30,35 +30,35 @@
30 30 };
31 31  
32 32 static const struct irq_class intrclass_names[] = {
33   - {.name = "EXT" },
34   - {.name = "I/O" },
35   - {.name = "CLK", .desc = "[EXT] Clock Comparator" },
36   - {.name = "EXC", .desc = "[EXT] External Call" },
37   - {.name = "EMS", .desc = "[EXT] Emergency Signal" },
38   - {.name = "TMR", .desc = "[EXT] CPU Timer" },
39   - {.name = "TAL", .desc = "[EXT] Timing Alert" },
40   - {.name = "PFL", .desc = "[EXT] Pseudo Page Fault" },
41   - {.name = "DSD", .desc = "[EXT] DASD Diag" },
42   - {.name = "VRT", .desc = "[EXT] Virtio" },
43   - {.name = "SCP", .desc = "[EXT] Service Call" },
44   - {.name = "IUC", .desc = "[EXT] IUCV" },
45   - {.name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling" },
46   - {.name = "CMC", .desc = "[EXT] CPU-Measurement: Counter" },
47   - {.name = "CMR", .desc = "[EXT] CPU-Measurement: RI" },
48   - {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt" },
49   - {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
50   - {.name = "DAS", .desc = "[I/O] DASD" },
51   - {.name = "C15", .desc = "[I/O] 3215" },
52   - {.name = "C70", .desc = "[I/O] 3270" },
53   - {.name = "TAP", .desc = "[I/O] Tape" },
54   - {.name = "VMR", .desc = "[I/O] Unit Record Devices" },
55   - {.name = "LCS", .desc = "[I/O] LCS" },
56   - {.name = "CLW", .desc = "[I/O] CLAW" },
57   - {.name = "CTC", .desc = "[I/O] CTC" },
58   - {.name = "APB", .desc = "[I/O] AP Bus" },
59   - {.name = "ADM", .desc = "[I/O] EADM Subchannel" },
60   - {.name = "CSC", .desc = "[I/O] CHSC Subchannel" },
61   - {.name = "NMI", .desc = "[NMI] Machine Check" },
  33 + [EXTERNAL_INTERRUPT] = {.name = "EXT"},
  34 + [IO_INTERRUPT] = {.name = "I/O"},
  35 + [EXTINT_CLK] = {.name = "CLK", .desc = "[EXT] Clock Comparator"},
  36 + [EXTINT_EXC] = {.name = "EXC", .desc = "[EXT] External Call"},
  37 + [EXTINT_EMS] = {.name = "EMS", .desc = "[EXT] Emergency Signal"},
  38 + [EXTINT_TMR] = {.name = "TMR", .desc = "[EXT] CPU Timer"},
  39 + [EXTINT_TLA] = {.name = "TAL", .desc = "[EXT] Timing Alert"},
  40 + [EXTINT_PFL] = {.name = "PFL", .desc = "[EXT] Pseudo Page Fault"},
  41 + [EXTINT_DSD] = {.name = "DSD", .desc = "[EXT] DASD Diag"},
  42 + [EXTINT_VRT] = {.name = "VRT", .desc = "[EXT] Virtio"},
  43 + [EXTINT_SCP] = {.name = "SCP", .desc = "[EXT] Service Call"},
  44 + [EXTINT_IUC] = {.name = "IUC", .desc = "[EXT] IUCV"},
  45 + [EXTINT_CMS] = {.name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling"},
  46 + [EXTINT_CMC] = {.name = "CMC", .desc = "[EXT] CPU-Measurement: Counter"},
  47 + [EXTINT_CMR] = {.name = "CMR", .desc = "[EXT] CPU-Measurement: RI"},
  48 + [IOINT_CIO] = {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt"},
  49 + [IOINT_QAI] = {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt"},
  50 + [IOINT_DAS] = {.name = "DAS", .desc = "[I/O] DASD"},
  51 + [IOINT_C15] = {.name = "C15", .desc = "[I/O] 3215"},
  52 + [IOINT_C70] = {.name = "C70", .desc = "[I/O] 3270"},
  53 + [IOINT_TAP] = {.name = "TAP", .desc = "[I/O] Tape"},
  54 + [IOINT_VMR] = {.name = "VMR", .desc = "[I/O] Unit Record Devices"},
  55 + [IOINT_LCS] = {.name = "LCS", .desc = "[I/O] LCS"},
  56 + [IOINT_CLW] = {.name = "CLW", .desc = "[I/O] CLAW"},
  57 + [IOINT_CTC] = {.name = "CTC", .desc = "[I/O] CTC"},
  58 + [IOINT_APB] = {.name = "APB", .desc = "[I/O] AP Bus"},
  59 + [IOINT_ADM] = {.name = "ADM", .desc = "[I/O] EADM Subchannel"},
  60 + [IOINT_CSC] = {.name = "CSC", .desc = "[I/O] CHSC Subchannel"},
  61 + [NMI_NMI] = {.name = "NMI", .desc = "[NMI] Machine Check"},
62 62 };
63 63  
64 64 /*