[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, 15 insertions, 22 deletions

diff --git a/drivers/char/rio/phb.h b/drivers/char/rio/phb.h
index 2663ca0306e2..05d59f4b9fb0 100644
--- a/drivers/char/rio/phb.h
+++ b/drivers/char/rio/phb.h
@@ -37,13 +37,6 @@
 #ifndef _phb_h
 #define _phb_h 1
 
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_phb_h_sccs = "@(#)phb.h    1.12"; */
-#endif
-#endif
-
-
 /*************************************************
  * Handshake asserted. Deasserted by the LTT(s)
  ************************************************/
@@ -126,21 +119,21 @@
  *************************************************************************/
 typedef struct PHB PHB;
 struct PHB {
-        WORD source;
-        WORD handshake;
-        WORD status;
-        NUMBER timeout;         /* Maximum of 1.9 seconds */
-        WORD link;              /* Send down this link */
-        WORD destination;
-        PKT_ptr_ptr tx_start;
-        PKT_ptr_ptr tx_end;
-        PKT_ptr_ptr tx_add;
-        PKT_ptr_ptr tx_remove;
-
-        PKT_ptr_ptr rx_start;
-        PKT_ptr_ptr rx_end;
-        PKT_ptr_ptr rx_add;
-        PKT_ptr_ptr rx_remove;
+        u8 source;
+        u8 handshake;
+        u8 status;
+        u16 timeout;            /* Maximum of 1.9 seconds */
+        u8 link;                /* Send down this link */
+        u8 destination;
+        u16 tx_start;
+        u16 tx_end;
+        u16 tx_add;
+        u16 tx_remove;
+
+        u16 rx_start;
+        u16 rx_end;
+        u16 rx_add;
+        u16 rx_remove;
 
 };