1 files changed, 23 insertions, 25 deletions
diff --git a/drivers/char/rio/riodrvr.h b/drivers/char/rio/riodrvr.h
index 663ee0914ed7..3cffe275f216 100644
--- a/drivers/char/rio/riodrvr.h
+++ b/drivers/char/rio/riodrvr.h
@@ -72,42 +72,42 @@ struct rio_info {
 */
        int RIOHalted;          /* halted ? */
        int RIORtaDisCons;      /* RTA connections/disconnections */
-        uint RIOReadCheck;      /* Rio read check */
+        unsigned int RIOReadCheck;      /* Rio read check */
-        uint RIONoMessage;      /* To display message or not */
+        unsigned int RIONoMessage;      /* To display message or not */
-        uint RIONumBootPkts;    /* how many packets for an RTA */
+        unsigned int RIONumBootPkts;    /* how many packets for an RTA */
-        uint RIOBootCount;      /* size of RTA code */
+        unsigned int RIOBootCount;      /* size of RTA code */
-        uint RIOBooting;        /* count of outstanding boots */
+        unsigned int RIOBooting;        /* count of outstanding boots */
-        uint RIOSystemUp;       /* Booted ?? */
+        unsigned int RIOSystemUp;       /* Booted ?? */
-        uint RIOCounting;       /* for counting interrupts */
+        unsigned int RIOCounting;       /* for counting interrupts */
-        uint RIOIntCount;       /* # of intr since last check */
+        unsigned int RIOIntCount;       /* # of intr since last check */
-        uint RIOTxCount;        /* number of xmit intrs  */
+        unsigned int RIOTxCount;        /* number of xmit intrs  */
-        uint RIORxCount;        /* number of rx intrs */
+        unsigned int RIORxCount;        /* number of rx intrs */
-        uint RIORupCount;       /* number of rup intrs */
+        unsigned int RIORupCount;       /* number of rup intrs */
        int RIXTimer;
        int RIOBufferSize;      /* Buffersize */
        int RIOBufferMask;      /* Buffersize */
        int RIOFirstMajor;      /* First host card's major no */
-        uint RIOLastPortsMapped;        /* highest port number known */
+        unsigned int RIOLastPortsMapped;        /* highest port number known */
-        uint RIOFirstPortsMapped;       /* lowest port number known */
+        unsigned int RIOFirstPortsMapped;       /* lowest port number known */
-        uint RIOLastPortsBooted;        /* highest port number running */
+        unsigned int RIOLastPortsBooted;        /* highest port number running */
-        uint RIOFirstPortsBooted;       /* lowest port number running */
+        unsigned int RIOFirstPortsBooted;       /* lowest port number running */
-        uint RIOLastPortsOpened;        /* highest port number running */
+        unsigned int RIOLastPortsOpened;        /* highest port number running */
-        uint RIOFirstPortsOpened;       /* lowest port number running */
+        unsigned int RIOFirstPortsOpened;       /* lowest port number running */
        /* Flag to say that the topology information has been changed. */
-        uint RIOQuickCheck;
+        unsigned int RIOQuickCheck;
-        uint CdRegister;        /* ??? */
+        unsigned int CdRegister;        /* ??? */
        int RIOSignalProcess;   /* Signalling process */
        int rio_debug;          /* To debug ... */
        int RIODebugWait;       /* For what ??? */
        int tpri;               /* Thread prio */
        int tid;                /* Thread id */
-        uint _RIO_Polled;       /* Counter for polling */
+        unsigned int _RIO_Polled;       /* Counter for polling */
-        uint _RIO_Interrupted;  /* Counter for interrupt */
+        unsigned int _RIO_Interrupted;  /* Counter for interrupt */
        int intr_tid;           /* iointset return value */
        int TxEnSem;            /* TxEnable Semaphore */
@@ -121,9 +121,9 @@ struct rio_info {
        struct Map RIOSavedTable[TOTAL_MAP_ENTRIES];
        /* RTA to host binding table for master/slave operation */
-        ulong RIOBindTab[MAX_RTA_BINDINGS];
+        unsigned long RIOBindTab[MAX_RTA_BINDINGS];
        /* RTA memory dump variable */
-        uchar RIOMemDump[MEMDUMP_SIZE];
+        unsigned char RIOMemDump[MEMDUMP_SIZE];
        struct ModuleInfo RIOModuleTypes[MAX_MODULE_TYPES];
 };
@@ -138,7 +138,5 @@ struct rio_info {
 #define RIO_RESET_INT   0x7d80
-#define WRBYTE(x,y)             *(volatile unsigned char *)((x)) = \
-                                        (unsigned char)(y)
 #endif                          /* __riodrvr.h */

diff --git a/drivers/char/rio/riodrvr.h b/drivers/char/rio/riodrvr.h index 663ee0914ed7..3cffe275f216 100644 --- a/drivers/char/rio/riodrvr.h +++ b/drivers/char/rio/riodrvr.h
@@ -72,42 +72,42 @@ struct rio_info {
72	*/	72	*/
73	int RIOHalted; /* halted ? */	73	int RIOHalted; /* halted ? */
74	int RIORtaDisCons; /* RTA connections/disconnections */	74	int RIORtaDisCons; /* RTA connections/disconnections */
75	uint RIOReadCheck; /* Rio read check */	75	unsigned int RIOReadCheck; /* Rio read check */
76	uint RIONoMessage; /* To display message or not */	76	unsigned int RIONoMessage; /* To display message or not */
77	uint RIONumBootPkts; /* how many packets for an RTA */	77	unsigned int RIONumBootPkts; /* how many packets for an RTA */
78	uint RIOBootCount; /* size of RTA code */	78	unsigned int RIOBootCount; /* size of RTA code */
79	uint RIOBooting; /* count of outstanding boots */	79	unsigned int RIOBooting; /* count of outstanding boots */
80	uint RIOSystemUp; /* Booted ?? */	80	unsigned int RIOSystemUp; /* Booted ?? */
81	uint RIOCounting; /* for counting interrupts */	81	unsigned int RIOCounting; /* for counting interrupts */
82	uint RIOIntCount; /* # of intr since last check */	82	unsigned int RIOIntCount; /* # of intr since last check */
83	uint RIOTxCount; /* number of xmit intrs */	83	unsigned int RIOTxCount; /* number of xmit intrs */
84	uint RIORxCount; /* number of rx intrs */	84	unsigned int RIORxCount; /* number of rx intrs */
85	uint RIORupCount; /* number of rup intrs */	85	unsigned int RIORupCount; /* number of rup intrs */
86	int RIXTimer;	86	int RIXTimer;
87	int RIOBufferSize; /* Buffersize */	87	int RIOBufferSize; /* Buffersize */
88	int RIOBufferMask; /* Buffersize */	88	int RIOBufferMask; /* Buffersize */
89		89
90	int RIOFirstMajor; /* First host card's major no */	90	int RIOFirstMajor; /* First host card's major no */
91		91
92	uint RIOLastPortsMapped; /* highest port number known */	92	unsigned int RIOLastPortsMapped; /* highest port number known */
93	uint RIOFirstPortsMapped; /* lowest port number known */	93	unsigned int RIOFirstPortsMapped; /* lowest port number known */
94		94
95	uint RIOLastPortsBooted; /* highest port number running */	95	unsigned int RIOLastPortsBooted; /* highest port number running */
96	uint RIOFirstPortsBooted; /* lowest port number running */	96	unsigned int RIOFirstPortsBooted; /* lowest port number running */
97		97
98	uint RIOLastPortsOpened; /* highest port number running */	98	unsigned int RIOLastPortsOpened; /* highest port number running */
99	uint RIOFirstPortsOpened; /* lowest port number running */	99	unsigned int RIOFirstPortsOpened; /* lowest port number running */
100		100
101	/* Flag to say that the topology information has been changed. */	101	/* Flag to say that the topology information has been changed. */
102	uint RIOQuickCheck;	102	unsigned int RIOQuickCheck;
103	uint CdRegister; /* ??? */	103	unsigned int CdRegister; /* ??? */
104	int RIOSignalProcess; /* Signalling process */	104	int RIOSignalProcess; /* Signalling process */
105	int rio_debug; /* To debug ... */	105	int rio_debug; /* To debug ... */
106	int RIODebugWait; /* For what ??? */	106	int RIODebugWait; /* For what ??? */
107	int tpri; /* Thread prio */	107	int tpri; /* Thread prio */
108	int tid; /* Thread id */	108	int tid; /* Thread id */
109	uint _RIO_Polled; /* Counter for polling */	109	unsigned int _RIO_Polled; /* Counter for polling */
110	uint _RIO_Interrupted; /* Counter for interrupt */	110	unsigned int _RIO_Interrupted; /* Counter for interrupt */
111	int intr_tid; /* iointset return value */	111	int intr_tid; /* iointset return value */
112	int TxEnSem; /* TxEnable Semaphore */	112	int TxEnSem; /* TxEnable Semaphore */
113		113
@@ -121,9 +121,9 @@ struct rio_info {
121	struct Map RIOSavedTable[TOTAL_MAP_ENTRIES];	121	struct Map RIOSavedTable[TOTAL_MAP_ENTRIES];
122		122
123	/* RTA to host binding table for master/slave operation */	123	/* RTA to host binding table for master/slave operation */
124	ulong RIOBindTab[MAX_RTA_BINDINGS];	124	unsigned long RIOBindTab[MAX_RTA_BINDINGS];
125	/* RTA memory dump variable */	125	/* RTA memory dump variable */
126	uchar RIOMemDump[MEMDUMP_SIZE];	126	unsigned char RIOMemDump[MEMDUMP_SIZE];
127	struct ModuleInfo RIOModuleTypes[MAX_MODULE_TYPES];	127	struct ModuleInfo RIOModuleTypes[MAX_MODULE_TYPES];
128		128
129	};	129	};
@@ -138,7 +138,5 @@ struct rio_info {
138		138
139		139
140	#define RIO_RESET_INT 0x7d80	140	#define RIO_RESET_INT 0x7d80
141	#define WRBYTE(x,y) (volatile unsigned char )((x)) = \
142	(unsigned char)(y)
143		141
144	#endif /* __riodrvr.h */	142	#endif /* __riodrvr.h */