Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6d4740c89c187ee8f5ac7355c4eeffda26493d1f

Authored by Stefan Haberland
Committed by Martin Schwidefsky
1 parent 66b494a717
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[S390] sclp: fix coding style. 

Use only capital letters for defines.

Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 8 changed files with 58 additions and 58 deletions Side-by-side Diff

drivers/s390/char/sclp.c
Diff comments   View file @ 6d4740c
... ... @@ -511,7 +511,7 @@
511 511 }
512 512  
513 513 static struct sclp_register sclp_state_change_event = {
514   - .receive_mask = EvTyp_StateChange_Mask,
  514 + .receive_mask = EVTYP_STATECHANGE_MASK,
515 515 .receiver_fn = sclp_state_change_cb
516 516 };
517 517  
drivers/s390/char/sclp.h
Diff comments   View file @ 6d4740c
... ... @@ -19,35 +19,35 @@
19 19 #define MAX_KMEM_PAGES (sizeof(unsigned long) << 3)
20 20 #define MAX_CONSOLE_PAGES 4
21 21  
22   -#define EvTyp_OpCmd 0x01
23   -#define EvTyp_Msg 0x02
24   -#define EvTyp_StateChange 0x08
25   -#define EvTyp_PMsgCmd 0x09
26   -#define EvTyp_CntlProgOpCmd 0x20
27   -#define EvTyp_CntlProgIdent 0x0B
28   -#define EvTyp_SigQuiesce 0x1D
29   -#define EvTyp_VT220Msg 0x1A
30   -#define EvTyp_SDIAS 0x1C
  22 +#define EVTYP_OPCMD 0x01
  23 +#define EVTYP_MSG 0x02
  24 +#define EVTYP_STATECHANGE 0x08
  25 +#define EVTYP_PMSGCMD 0x09
  26 +#define EVTYP_CNTLPROGOPCMD 0x20
  27 +#define EVTYP_CNTLPROGIDENT 0x0B
  28 +#define EVTYP_SIGQUIESCE 0x1D
  29 +#define EVTYP_VT220MSG 0x1A
  30 +#define EVTYP_SDIAS 0x1C
31 31  
32   -#define EvTyp_OpCmd_Mask 0x80000000
33   -#define EvTyp_Msg_Mask 0x40000000
34   -#define EvTyp_StateChange_Mask 0x01000000
35   -#define EvTyp_PMsgCmd_Mask 0x00800000
36   -#define EvTyp_CtlProgOpCmd_Mask 0x00000001
37   -#define EvTyp_CtlProgIdent_Mask 0x00200000
38   -#define EvTyp_SigQuiesce_Mask 0x00000008
39   -#define EvTyp_VT220Msg_Mask 0x00000040
40   -#define EvTyp_SDIAS_Mask 0x00000010
  32 +#define EVTYP_OPCMD_MASK 0x80000000
  33 +#define EVTYP_MSG_MASK 0x40000000
  34 +#define EVTYP_STATECHANGE_MASK 0x01000000
  35 +#define EVTYP_PMSGCMD_MASK 0x00800000
  36 +#define EVTYP_CTLPROGOPCMD_MASK 0x00000001
  37 +#define EVTYP_CTLPROGIDENT_MASK 0x00200000
  38 +#define EVTYP_SIGQUIESCE_MASK 0x00000008
  39 +#define EVTYP_VT220MSG_MASK 0x00000040
  40 +#define EVTYP_SDIAS_MASK 0x00000010
41 41  
42   -#define GnrlMsgFlgs_DOM 0x8000
43   -#define GnrlMsgFlgs_SndAlrm 0x4000
44   -#define GnrlMsgFlgs_HoldMsg 0x2000
  42 +#define GNRLMSGFLGS_DOM 0x8000
  43 +#define GNRLMSGFLGS_SNDALRM 0x4000
  44 +#define GNRLMSGFLGS_HOLDMSG 0x2000
45 45  
46   -#define LnTpFlgs_CntlText 0x8000
47   -#define LnTpFlgs_LabelText 0x4000
48   -#define LnTpFlgs_DataText 0x2000
49   -#define LnTpFlgs_EndText 0x1000
50   -#define LnTpFlgs_PromptText 0x0800
  46 +#define LNTPFLGS_CNTLTEXT 0x8000
  47 +#define LNTPFLGS_LABELTEXT 0x4000
  48 +#define LNTPFLGS_DATATEXT 0x2000
  49 +#define LNTPFLGS_ENDTEXT 0x1000
  50 +#define LNTPFLGS_PROMPTTEXT 0x0800
51 51  
52 52 typedef unsigned int sclp_cmdw_t;
53 53  
54 54  
55 55  
... ... @@ -58,15 +58,15 @@
58 58 #define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001
59 59  
60 60 #define GDS_ID_MDSMU 0x1310
61   -#define GDS_ID_MDSRouteInfo 0x1311
62   -#define GDS_ID_AgUnWrkCorr 0x1549
63   -#define GDS_ID_SNACondReport 0x1532
  61 +#define GDS_ID_MDSROUTEINFO 0x1311
  62 +#define GDS_ID_AGUNWRKCORR 0x1549
  63 +#define GDS_ID_SNACONDREPORT 0x1532
64 64 #define GDS_ID_CPMSU 0x1212
65   -#define GDS_ID_RoutTargInstr 0x154D
66   -#define GDS_ID_OpReq 0x8070
67   -#define GDS_ID_TextCmd 0x1320
  65 +#define GDS_ID_ROUTTARGINSTR 0x154D
  66 +#define GDS_ID_OPREQ 0x8070
  67 +#define GDS_ID_TEXTCMD 0x1320
68 68  
69   -#define GDS_KEY_SelfDefTextMsg 0x31
  69 +#define GDS_KEY_SELFDEFTEXTMSG 0x31
70 70  
71 71 typedef u32 sccb_mask_t; /* ATTENTION: assumes 32bit mask !!! */
72 72  
drivers/s390/char/sclp_cpi.c
Diff comments   View file @ 6d4740c
... ... @@ -46,7 +46,7 @@
46 46 /* Event type structure for write message and write priority message */
47 47 static struct sclp_register sclp_cpi_event =
48 48 {
49   - .send_mask = EvTyp_CtlProgIdent_Mask
  49 + .send_mask = EVTYP_CTLPROGIDENT_MASK
50 50 };
51 51  
52 52 MODULE_LICENSE("GPL");
... ... @@ -201,7 +201,7 @@
201 201 "console.\n");
202 202 return -EINVAL;
203 203 }
204   - if (!(sclp_cpi_event.sclp_send_mask & EvTyp_CtlProgIdent_Mask)) {
  204 + if (!(sclp_cpi_event.sclp_send_mask & EVTYP_CTLPROGIDENT_MASK)) {
205 205 printk(KERN_WARNING "cpi: no control program identification "
206 206 "support\n");
207 207 sclp_unregister(&sclp_cpi_event);
drivers/s390/char/sclp_quiesce.c
Diff comments   View file @ 6d4740c
... ... @@ -43,7 +43,7 @@
43 43 }
44 44  
45 45 static struct sclp_register sclp_quiesce_event = {
46   - .receive_mask = EvTyp_SigQuiesce_Mask,
  46 + .receive_mask = EVTYP_SIGQUIESCE_MASK,
47 47 .receiver_fn = sclp_quiesce_handler
48 48 };
49 49  
drivers/s390/char/sclp_rw.c
Diff comments   View file @ 6d4740c
... ... @@ -30,7 +30,7 @@
30 30  
31 31 /* Event type structure for write message and write priority message */
32 32 static struct sclp_register sclp_rw_event = {
33   - .send_mask = EvTyp_Msg_Mask | EvTyp_PMsgCmd_Mask
  33 + .send_mask = EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK
34 34 };
35 35  
36 36 /*
... ... @@ -64,7 +64,7 @@
64 64 memset(sccb, 0, sizeof(struct write_sccb));
65 65 sccb->header.length = sizeof(struct write_sccb);
66 66 sccb->msg_buf.header.length = sizeof(struct msg_buf);
67   - sccb->msg_buf.header.type = EvTyp_Msg;
  67 + sccb->msg_buf.header.type = EVTYP_MSG;
68 68 sccb->msg_buf.mdb.header.length = sizeof(struct mdb);
69 69 sccb->msg_buf.mdb.header.type = 1;
70 70 sccb->msg_buf.mdb.header.tag = 0xD4C4C240; /* ebcdic "MDB " */
... ... @@ -114,7 +114,7 @@
114 114 memset(mto, 0, sizeof(struct mto));
115 115 mto->length = sizeof(struct mto);
116 116 mto->type = 4; /* message text object */
117   - mto->line_type_flags = LnTpFlgs_EndText; /* end text */
  117 + mto->line_type_flags = LNTPFLGS_ENDTEXT; /* end text */
118 118  
119 119 /* set pointer to first byte after struct mto. */
120 120 buffer->current_line = (char *) (mto + 1);
... ... @@ -215,7 +215,7 @@
215 215 case '\a': /* bell, one for several times */
216 216 /* set SCLP sound alarm bit in General Object */
217 217 buffer->sccb->msg_buf.mdb.go.general_msg_flags |=
218   - GnrlMsgFlgs_SndAlrm;
  218 + GNRLMSGFLGS_SNDALRM;
219 219 break;
220 220 case '\t': /* horizontal tabulator */
221 221 /* check if new mto needs to be created */
222 222  
223 223  
... ... @@ -452,12 +452,12 @@
452 452 return -EIO;
453 453  
454 454 sccb = buffer->sccb;
455   - if (sclp_rw_event.sclp_send_mask & EvTyp_Msg_Mask)
  455 + if (sclp_rw_event.sclp_send_mask & EVTYP_MSG_MASK)
456 456 /* Use normal write message */
457   - sccb->msg_buf.header.type = EvTyp_Msg;
458   - else if (sclp_rw_event.sclp_send_mask & EvTyp_PMsgCmd_Mask)
  457 + sccb->msg_buf.header.type = EVTYP_MSG;
  458 + else if (sclp_rw_event.sclp_send_mask & EVTYP_PMSGCMD_MASK)
459 459 /* Use write priority message */
460   - sccb->msg_buf.header.type = EvTyp_PMsgCmd;
  460 + sccb->msg_buf.header.type = EVTYP_PMSGCMD;
461 461 else
462 462 return -ENOSYS;
463 463 buffer->request.command = SCLP_CMDW_WRITE_EVENT_DATA;
drivers/s390/char/sclp_sdias.c
Diff comments   View file @ 6d4740c
... ... @@ -30,7 +30,7 @@
30 30 static struct debug_info *sdias_dbf;
31 31  
32 32 static struct sclp_register sclp_sdias_register = {
33   - .send_mask = EvTyp_SDIAS_Mask,
  33 + .send_mask = EVTYP_SDIAS_MASK,
34 34 };
35 35  
36 36 struct sdias_evbuf {
... ... @@ -118,7 +118,7 @@
118 118  
119 119 sccb.hdr.length = sizeof(sccb);
120 120 sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);
121   - sccb.evbuf.hdr.type = EvTyp_SDIAS;
  121 + sccb.evbuf.hdr.type = EVTYP_SDIAS;
122 122 sccb.evbuf.event_qual = EQ_SIZE;
123 123 sccb.evbuf.data_id = DI_FCP_DUMP;
124 124 sccb.evbuf.event_id = 4712;
... ... @@ -177,7 +177,7 @@
177 177  
178 178 sccb.hdr.length = sizeof(sccb);
179 179 sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);
180   - sccb.evbuf.hdr.type = EvTyp_SDIAS;
  180 + sccb.evbuf.hdr.type = EVTYP_SDIAS;
181 181 sccb.evbuf.hdr.flags = 0;
182 182 sccb.evbuf.event_qual = EQ_STORE_DATA;
183 183 sccb.evbuf.data_id = DI_FCP_DUMP;
drivers/s390/char/sclp_tty.c
Diff comments   View file @ 6d4740c
... ... @@ -648,7 +648,7 @@
648 648 subvec = start;
649 649 while (subvec < end) {
650 650 subvec = find_gds_subvector(subvec, end,
651   - GDS_KEY_SelfDefTextMsg);
  651 + GDS_KEY_SELFDEFTEXTMSG);
652 652 if (!subvec)
653 653 break;
654 654 sclp_eval_selfdeftextmsg((struct gds_subvector *)(subvec + 1),
... ... @@ -664,7 +664,7 @@
664 664  
665 665 vec = start;
666 666 while (vec < end) {
667   - vec = find_gds_vector(vec, end, GDS_ID_TextCmd);
  667 + vec = find_gds_vector(vec, end, GDS_ID_TEXTCMD);
668 668 if (!vec)
669 669 break;
670 670 sclp_eval_textcmd((struct gds_subvector *)(vec + 1),
... ... @@ -703,7 +703,7 @@
703 703  
704 704 static struct sclp_register sclp_input_event =
705 705 {
706   - .receive_mask = EvTyp_OpCmd_Mask | EvTyp_PMsgCmd_Mask,
  706 + .receive_mask = EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK,
707 707 .state_change_fn = sclp_tty_state_change,
708 708 .receiver_fn = sclp_tty_receiver
709 709 };
drivers/s390/char/sclp_vt220.c
Diff comments   View file @ 6d4740c
... ... @@ -99,8 +99,8 @@
99 99  
100 100 /* Registration structure for our interest in SCLP event buffers */
101 101 static struct sclp_register sclp_vt220_register = {
102   - .send_mask = EvTyp_VT220Msg_Mask,
103   - .receive_mask = EvTyp_VT220Msg_Mask,
  102 + .send_mask = EVTYP_VT220MSG_MASK,
  103 + .receive_mask = EVTYP_VT220MSG_MASK,
104 104 .state_change_fn = NULL,
105 105 .receiver_fn = sclp_vt220_receiver_fn
106 106 };
... ... @@ -202,7 +202,7 @@
202 202 static int
203 203 __sclp_vt220_emit(struct sclp_vt220_request *request)
204 204 {
205   - if (!(sclp_vt220_register.sclp_send_mask & EvTyp_VT220Msg_Mask)) {
  205 + if (!(sclp_vt220_register.sclp_send_mask & EVTYP_VT220MSG_MASK)) {
206 206 request->sclp_req.status = SCLP_REQ_FAILED;
207 207 return -EIO;
208 208 }
... ... @@ -284,7 +284,7 @@
284 284 sccb->header.length = sizeof(struct sclp_vt220_sccb);
285 285 sccb->header.function_code = SCLP_NORMAL_WRITE;
286 286 sccb->header.response_code = 0x0000;
287   - sccb->evbuf.type = EvTyp_VT220Msg;
  287 + sccb->evbuf.type = EVTYP_VT220MSG;
288 288 sccb->evbuf.length = sizeof(struct evbuf_header);
289 289  
290 290 return request;