[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, 8 insertions, 16 deletions

diff --git a/drivers/char/rio/pkt.h b/drivers/char/rio/pkt.h
index 7011e52e82db..a9458164f02f 100644
--- a/drivers/char/rio/pkt.h
+++ b/drivers/char/rio/pkt.h
@@ -37,14 +37,6 @@
 #ifndef _pkt_h
 #define _pkt_h 1
 
-
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_pkt_h_sccs = "@(#)pkt.h    1.8"; */
-#endif
-#endif
-
-#define MAX_TTL         0xf
 #define PKT_CMD_BIT     ((ushort) 0x080)
 #define PKT_CMD_DATA    ((ushort) 0x080)
 
@@ -70,15 +62,15 @@
 #define CONTROL_DATA_WNDW  (DATA_WNDW << 8)
 
 struct PKT {
-        BYTE dest_unit;         /* Destination Unit Id */
-        BYTE dest_port;         /* Destination POrt */
-        BYTE src_unit;          /* Source Unit Id */
-        BYTE src_port;          /* Source POrt */
-        BYTE len;
-        BYTE control;
-        BYTE data[PKT_MAX_DATA_LEN];
+        u8 dest_unit;           /* Destination Unit Id */
+        u8 dest_port;           /* Destination POrt */
+        u8 src_unit;            /* Source Unit Id */
+        u8 src_port;            /* Source POrt */
+        u8 len;
+        u8 control;
+        u8 data[PKT_MAX_DATA_LEN];
         /* Actual data :-) */
-        WORD csum;              /* C-SUM */
+        u16 csum;               /* C-SUM */
 };
 #endif