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

diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h
index e24acc1d1844..c4085fbf9ec6 100644
--- a/drivers/char/rio/parmmap.h
+++ b/drivers/char/rio/parmmap.h
@@ -48,39 +48,39 @@ typedef struct PARM_MAP PARM_MAP;
 
 struct PARM_MAP {
 	PHB_ptr phb_ptr;	/* Pointer to the PHB array */
-	WORD_ptr phb_num_ptr;	/* Ptr to Number of PHB's */
+	u16 phb_num_ptr;	/* Ptr to Number of PHB's */
 	FREE_LIST_ptr free_list;	/* Free List pointer */
 	FREE_LIST_ptr free_list_end;	/* Free List End pointer */
 	Q_BUF_ptr_ptr q_free_list_ptr;	/* Ptr to Q_BUF variable */
-	BYTE_ptr unit_id_ptr;	/* Unit Id */
+	u16 unit_id_ptr;	/* Unit Id */
 	LPB_ptr link_str_ptr;	/* Link Structure Array */
-	BYTE_ptr bootloader_1;	/* 1st Stage Boot Loader */
-	BYTE_ptr bootloader_2;	/* 2nd Stage Boot Loader */
-	WORD_ptr port_route_map_ptr;	/* Port Route Map */
+	u16 bootloader_1;	/* 1st Stage Boot Loader */
+	u16 bootloader_2;	/* 2nd Stage Boot Loader */
+	u16 port_route_map_ptr;	/* Port Route Map */
 	ROUTE_STR_ptr route_ptr;	/* Unit Route Map */
-	NUMBER_ptr map_present;	/* Route Map present */
-	NUMBER pkt_num;		/* Total number of packets */
-	NUMBER q_num;		/* Total number of Q packets */
-	WORD buffers_per_port;	/* Number of buffers per port */
-	WORD heap_size;		/* Initial size of heap */
-	WORD heap_left;		/* Current Heap left */
-	WORD error;		/* Error code */
-	WORD tx_max;		/* Max number of tx pkts per phb */
-	WORD rx_max;		/* Max number of rx pkts per phb */
-	WORD rx_limit;		/* For high / low watermarks */
-	NUMBER links;		/* Links to use */
-	NUMBER timer;		/* Interrupts per second */
+	u16 map_present;	/* Route Map present */
+	s16 pkt_num;		/* Total number of packets */
+	s16 q_num;		/* Total number of Q packets */
+	u16 buffers_per_port;	/* Number of buffers per port */
+	u16 heap_size;		/* Initial size of heap */
+	u16 heap_left;		/* Current Heap left */
+	u16 error;		/* Error code */
+	u16 tx_max;		/* Max number of tx pkts per phb */
+	u16 rx_max;		/* Max number of rx pkts per phb */
+	u16 rx_limit;		/* For high / low watermarks */
+	s16 links;		/* Links to use */
+	s16 timer;		/* Interrupts per second */
 	RUP_ptr rups;		/* Pointer to the RUPs */
-	WORD max_phb;		/* Mostly for debugging */
-	WORD living;		/* Just increments!! */
-	WORD init_done;		/* Initialisation over */
-	WORD booting_link;
-	WORD idle_count;	/* Idle time counter */
-	WORD busy_count;	/* Busy counter */
-	WORD idle_control;	/* Control Idle Process */
-	WORD tx_intr;		/* TX interrupt pending */
-	WORD rx_intr;		/* RX interrupt pending */
-	WORD rup_intr;		/* RUP interrupt pending */
+	u16 max_phb;		/* Mostly for debugging */
+	u16 living;		/* Just increments!! */
+	u16 init_done;		/* Initialisation over */
+	u16 booting_link;
+	u16 idle_count;		/* Idle time counter */
+	u16 busy_count;		/* Busy counter */
+	u16 idle_control;	/* Control Idle Process */
+	u16 tx_intr;		/* TX interrupt pending */
+	u16 rx_intr;		/* RX interrupt pending */
+	u16 rup_intr;		/* RUP interrupt pending */
 };
 
 #endif