[PATCH] rio driver rework continued #1

More header cleanups, strip out typedefs and remove cruft.  There are a lot of
magic macros that can go and also a great deal of abuse of volatile that is
not needed any more as this patch set cleans up the misuse of pointer access
to ISA and PCI space.

It now builds cleanly on 64bit, although there is more work left to do

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 31 insertions, 36 deletions

diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h
index 28a991bd4fe6..5818a8aa46e0 100644
--- a/drivers/char/rio/daemon.h
+++ b/drivers/char/rio/daemon.h
@@ -45,15 +45,15 @@ static char *_daemon_h_sccs_ = "@(#)daemon.h	1.3";
 */
 
 struct Error {
-        uint Error;
-        uint Entry;
-        uint Other;
+        unsigned int Error;
+        unsigned int Entry;
+        unsigned int Other;
 };
 
 struct DownLoad {
         char *DataP;
-        uint Count;
-        uint ProductCode;
+        unsigned int Count;
+        unsigned int ProductCode;
 };
 
 /*
@@ -68,69 +68,64 @@ struct DownLoad {
 #endif
 
 struct PortSetup {
-        uint From;              /* Set/Clear XP & IXANY Control from this port.... */
-        uint To;                /* .... to this port */
-        uint XpCps;             /* at this speed */
+        unsigned int From;              /* Set/Clear XP & IXANY Control from this port.... */
+        unsigned int To;                /* .... to this port */
+        unsigned int XpCps;             /* at this speed */
         char XpOn[MAX_XP_CTRL_LEN];     /* this is the start string */
         char XpOff[MAX_XP_CTRL_LEN];    /* this is the stop string */
-        uchar IxAny;            /* enable/disable IXANY */
-        uchar IxOn;             /* enable/disable IXON */
-        uchar Lock;             /* lock port params */
-        uchar Store;            /* store params across closes */
-        uchar Drain;            /* close only when drained */
+        u8 IxAny;                       /* enable/disable IXANY */
+        u8 IxOn;                        /* enable/disable IXON */
+        u8 Lock;                        /* lock port params */
+        u8 Store;                       /* store params across closes */
+        u8 Drain;                       /* close only when drained */
 };
 
 struct LpbReq {
-        uint Host;
-        uint Link;
+        unsigned int Host;
+        unsigned int Link;
         struct LPB *LpbP;
 };
 
 struct RupReq {
-        uint HostNum;
-        uint RupNum;
+        unsigned int HostNum;
+        unsigned int RupNum;
         struct RUP *RupP;
 };
 
 struct PortReq {
-        uint SysPort;
+        unsigned int SysPort;
         struct Port *PortP;
 };
 
 struct StreamInfo {
-        uint SysPort;
-#if 0
-        queue_t RQueue;
-        queue_t WQueue;
-#else
+        unsigned int SysPort;
         int RQueue;
         int WQueue;
-#endif
 };
 
 struct HostReq {
-        uint HostNum;
+        unsigned int HostNum;
         struct Host *HostP;
 };
 
 struct HostDpRam {
-        uint HostNum;
+        unsigned int HostNum;
         struct DpRam *DpRamP;
 };
 
 struct DebugCtrl {
-        uint SysPort;
-        uint Debug;
-        uint Wait;
+        unsigned int SysPort;
+        unsigned int Debug;
+        unsigned int Wait;
 };
 
 struct MapInfo {
-        uint FirstPort;         /* 8 ports, starting from this (tty) number */
-        uint RtaUnique;         /* reside on this RTA (unique number) */
+        unsigned int FirstPort;         /* 8 ports, starting from this (tty) number */
+        unsigned int RtaUnique;         /* reside on this RTA (unique number) */
 };
 
 struct MapIn {
-        uint NumEntries;        /* How many port sets are we mapping? */
+        unsigned int NumEntries;        /* How many port sets are we mapping? */
         struct MapInfo *MapInfoP;       /* Pointer to (user space) info */
 };
 
@@ -147,13 +142,13 @@ struct SpecialRupCmd {
 };
 
 struct IdentifyRta {
-        ulong RtaUnique;
-        uchar ID;
+        unsigned long RtaUnique;
+        u8 ID;
 };
 
 struct KillNeighbour {
-        ulong UniqueNum;
-        uchar Link;
+        unsigned long UniqueNum;
+        u8 Link;
 };
 
 struct rioVersion {