[PATCH] rio: more header cleanup

Strip some of the typedef mess out Remove a small subset of unused defines
and the like.

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, 7 insertions, 14 deletions

diff --git a/drivers/char/rio/rup.h b/drivers/char/rio/rup.h
index f74f67c6f702..40c617436bd1 100644
--- a/drivers/char/rio/rup.h
+++ b/drivers/char/rio/rup.h
@@ -37,14 +37,7 @@
 #ifndef _rup_h
 #define _rup_h 1
 
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_rup_h_sccs = "@(#)rup.h    1.5"; */
-#endif
-#endif
-
 #define MAX_RUP          ((short) 16)
-
 #define PKTS_PER_RUP     ((short) 2)    /* They are always used in pairs */
 
 /*************************************************
@@ -62,13 +55,13 @@
 struct RUP {
         PKT_ptr txpkt;          /* Outgoing packet */
         PKT_ptr rxpkt;          /* Incoming packet */
-        WORD link;              /* Which link to send down? */
-        BYTE rup_dest_unit[2];  /* Destination unit */
-        WORD handshake;         /* For handshaking */
-        WORD timeout;           /* Timeout */
-        WORD status;            /* Status */
-        WORD txcontrol;         /* Transmit control */
-        WORD rxcontrol;         /* Receive control */
+        u16 link;               /* Which link to send down? */
+        u8 rup_dest_unit[2];    /* Destination unit */
+        u16 handshake;          /* For handshaking */
+        u16 timeout;            /* Timeout */
+        u16 status;             /* Status */
+        u16 txcontrol;          /* Transmit control */
+        u16 rxcontrol;          /* Receive control */
 };
 
 #endif