1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h
index b6445d3f1416..357ae5722436 100644
--- a/drivers/char/rio/cmdpkt.h
+++ b/drivers/char/rio/cmdpkt.h
@@ -118,45 +118,45 @@ struct PktCmd_M {
        union {
                struct {
                        struct {
-                                uchar PcCommand;
+                                u8 PcCommand;
                                union {
-                                        uchar PcPhbNum;
+                                        u8 PcPhbNum;
-                                        uchar PcLinkNum;
+                                        u8 PcLinkNum;
-                                        uchar PcIDNum;
+                                        u8 PcIDNum;
                                } U0;
                        } CmdHdr;
                        struct {
-                                ushort NumPackets;
+                                u16 NumPackets;
-                                ushort LoadBase;
+                                u16 LoadBase;
-                                ushort CodeSize;
+                                u16 CodeSize;
                        } PcBootSequence;
                } S1;
                struct {
-                        ushort PcSequence;
+                        u16 PcSequence;
-                        uchar PcBootData[RTA_BOOT_DATA_SIZE];
+                        u8 PcBootData[RTA_BOOT_DATA_SIZE];
                } S2;
                struct {
-                        ushort __crud__;
+                        u16 __crud__;
-                        uchar PcUniqNum[4];     /* this is really a uint. */
+                        u8 PcUniqNum[4];        /* this is really a uint. */
-                        uchar PcModuleTypes;    /* what modules are fitted */
+                        u8 PcModuleTypes;       /* what modules are fitted */
                } S3;
                struct {
-                        ushort __cmd_hdr__;
+                        u16 __cmd_hdr__;
-                        uchar __undefined__;
+                        u8 __undefined__;
-                        uchar PcModemStatus;
+                        u8 PcModemStatus;
-                        uchar PcPortStatus;
+                        u8 PcPortStatus;
-                        uchar PcSubCommand;
+                        u8 PcSubCommand;
-                        ushort PcSubAddr;
+                        u16 PcSubAddr;
-                        uchar PcSubData[64];
+                        u8 PcSubData[64];
                } S4;
                struct {
-                        ushort __cmd_hdr__;
+                        u16 __cmd_hdr__;
-                        uchar PcCommandText[1];
+                        u8 PcCommandText[1];
-                        uchar __crud__[20];
+                        u8 __crud__[20];
-                        uchar PcIDNum2; /* Tacked on end */
+                        u8 PcIDNum2;    /* Tacked on end */
                } S5;
                struct {
-                        ushort __cmd_hdr__;
+                        u16 __cmd_hdr__;
                        struct Top Topology[LINKS_PER_UNIT];
                } S6;
        } U1;

diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h index b6445d3f1416..357ae5722436 100644 --- a/drivers/char/rio/cmdpkt.h +++ b/drivers/char/rio/cmdpkt.h
@@ -118,45 +118,45 @@ struct PktCmd_M {
118	union {	118	union {
119	struct {	119	struct {
120	struct {	120	struct {
121	uchar PcCommand;	121	u8 PcCommand;
122	union {	122	union {
123	uchar PcPhbNum;	123	u8 PcPhbNum;
124	uchar PcLinkNum;	124	u8 PcLinkNum;
125	uchar PcIDNum;	125	u8 PcIDNum;
126	} U0;	126	} U0;
127	} CmdHdr;	127	} CmdHdr;
128	struct {	128	struct {
129	ushort NumPackets;	129	u16 NumPackets;
130	ushort LoadBase;	130	u16 LoadBase;
131	ushort CodeSize;	131	u16 CodeSize;
132	} PcBootSequence;	132	} PcBootSequence;
133	} S1;	133	} S1;
134	struct {	134	struct {
135	ushort PcSequence;	135	u16 PcSequence;
136	uchar PcBootData[RTA_BOOT_DATA_SIZE];	136	u8 PcBootData[RTA_BOOT_DATA_SIZE];
137	} S2;	137	} S2;
138	struct {	138	struct {
139	ushort __crud__;	139	u16 __crud__;
140	uchar PcUniqNum[4]; /* this is really a uint. */	140	u8 PcUniqNum[4]; /* this is really a uint. */
141	uchar PcModuleTypes; /* what modules are fitted */	141	u8 PcModuleTypes; /* what modules are fitted */
142	} S3;	142	} S3;
143	struct {	143	struct {
144	ushort __cmd_hdr__;	144	u16 __cmd_hdr__;
145	uchar __undefined__;	145	u8 __undefined__;
146	uchar PcModemStatus;	146	u8 PcModemStatus;
147	uchar PcPortStatus;	147	u8 PcPortStatus;
148	uchar PcSubCommand;	148	u8 PcSubCommand;
149	ushort PcSubAddr;	149	u16 PcSubAddr;
150	uchar PcSubData[64];	150	u8 PcSubData[64];
151	} S4;	151	} S4;
152	struct {	152	struct {
153	ushort __cmd_hdr__;	153	u16 __cmd_hdr__;
154	uchar PcCommandText[1];	154	u8 PcCommandText[1];
155	uchar __crud__[20];	155	u8 __crud__[20];
156	uchar PcIDNum2; /* Tacked on end */	156	u8 PcIDNum2; /* Tacked on end */
157	} S5;	157	} S5;
158	struct {	158	struct {
159	ushort __cmd_hdr__;	159	u16 __cmd_hdr__;
160	struct Top Topology[LINKS_PER_UNIT];	160	struct Top Topology[LINKS_PER_UNIT];
161	} S6;	161	} S6;
162	} U1;	162	} U1;