Skip to content

Commit 240f3ee

Browse files
committed
Staging: cpc-usb: fix checkpatch warnings in sja2m16c.h
This fixes most of the coding style issues in sja2m16c.h Cc: Sebastian Haas <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0f064b5 commit 240f3ee

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

drivers/staging/cpc-usb/sja2m16c.h

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
#ifndef SJA2M16C_H
2-
#define SJA2M16C_H
1+
#ifndef _SJA2M16C_H
2+
#define _SJA2M16C_H
33

44
#include "cpc.h"
55

6-
#define BAUDRATE_TOLERANCE_PERCENT 1
7-
#define SAMPLEPOINT_TOLERANCE_PERCENT 5
8-
#define SAMPLEPOINT_UPPER_LIMIT 88
6+
#define BAUDRATE_TOLERANCE_PERCENT 1
7+
#define SAMPLEPOINT_TOLERANCE_PERCENT 5
8+
#define SAMPLEPOINT_UPPER_LIMIT 88
99

10-
// M16C parameters
11-
typedef struct FIELD_C0CONR {
10+
/* M16C parameters */
11+
struct FIELD_C0CONR {
1212
unsigned int brp:4;
13-
unsigned int sam:1;
14-
unsigned int pr:3;
15-
unsigned int dummy:8;
16-
} FIELD_C0CONR_T;
17-
typedef struct FIELD_C1CONR {
13+
unsigned int sam:1;
14+
unsigned int pr:3;
15+
unsigned int dummy:8;
16+
};
17+
struct FIELD_C1CONR {
1818
unsigned int ph1:3;
19-
unsigned int ph2:3;
20-
unsigned int sjw:2;
21-
unsigned int dummy:8;
22-
} FIELD_C1CONR_T;
19+
unsigned int ph2:3;
20+
unsigned int sjw:2;
21+
unsigned int dummy:8;
22+
};
2323
typedef union C0CONR {
2424
unsigned char c0con;
25-
FIELD_C0CONR_T bc0con;
25+
struct FIELD_C0CONR bc0con;
2626
} C0CONR_T;
2727
typedef union C1CONR {
2828
unsigned char c1con;
29-
FIELD_C1CONR_T bc1con;
29+
struct FIELD_C1CONR bc1con;
3030
} C1CONR_T;
3131

32-
#define SJA_TSEG1 ((pParams->btr1 & 0x0f)+1)
33-
#define SJA_TSEG2 (((pParams->btr1 & 0x70)>>4)+1)
34-
#define SJA_BRP ((pParams->btr0 & 0x3f)+1)
35-
#define SJA_SJW ((pParams->btr0 & 0xc0)>>6)
36-
#define SJA_SAM ((pParams->btr1 & 0x80)>>7)
32+
#define SJA_TSEG1 ((pParams->btr1 & 0x0f)+1)
33+
#define SJA_TSEG2 (((pParams->btr1 & 0x70)>>4)+1)
34+
#define SJA_BRP ((pParams->btr0 & 0x3f)+1)
35+
#define SJA_SJW ((pParams->btr0 & 0xc0)>>6)
36+
#define SJA_SAM ((pParams->btr1 & 0x80)>>7)
3737
int baudrate_m16c(int clk, int brp, int pr, int ph1, int ph2);
3838
int samplepoint_m16c(int brp, int pr, int ph1, int ph2);
39-
int SJA1000_TO_M16C_BASIC_Params(CPC_MSG_T * pMsg);
39+
int SJA1000_TO_M16C_BASIC_Params(CPC_MSG_T *pMsg);
4040

41-
#endif /* */
41+
#endif

0 commit comments

Comments
 (0)