1 files changed, 26 insertions, 26 deletions
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 13a37f137ea2..4a0a329beafb 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -52,11 +52,11 @@
 *      protection - since "write" code only needs to change the head, and
 *      interrupt code only needs to change the tail.
 */
-typedef struct {
+struct stlrq {
        char    *buf;
        char    *head;
        char    *tail;
-} stlrq_t;
+};
 /*
 *      Port, panel and board structures to hold status info about each.
@@ -67,14 +67,14 @@ typedef struct {
 *      is associated with, this makes it (fairly) easy to get back to the
 *      board/panel info for a port.
 */
-typedef struct stlport {
+struct stlport {
        unsigned long           magic;
-        int                     portnr;
+        unsigned int            portnr;
-        int                     panelnr;
+        unsigned int            panelnr;
-        int                     brdnr;
+        unsigned int            brdnr;
        int                     ioaddr;
        int                     uartaddr;
-        int                     pagenr;
+        unsigned int            pagenr;
        long                    istate;
        int                     flags;
        int                     baud_base;
@@ -97,31 +97,31 @@ typedef struct stlport {
        wait_queue_head_t       close_wait;
        struct work_struct      tqueue;
        comstats_t              stats;
-        stlrq_t                 tx;
+        struct stlrq            tx;
-} stlport_t;
+};
-typedef struct stlpanel {
+struct stlpanel {
        unsigned long   magic;
-        int             panelnr;
+        unsigned int    panelnr;
-        int             brdnr;
+        unsigned int    brdnr;
-        int             pagenr;
+        unsigned int    pagenr;
-        int             nrports;
+        unsigned int    nrports;
        int             iobase;
        void            *uartp;
        void            (*isr)(struct stlpanel *panelp, unsigned int iobase);
        unsigned int    hwid;
        unsigned int    ackmask;
-        stlport_t       *ports[STL_PORTSPERPANEL];
+        struct stlport  *ports[STL_PORTSPERPANEL];
-} stlpanel_t;
+};
-typedef struct stlbrd {
+struct stlbrd {
        unsigned long   magic;
-        int             brdnr;
+        unsigned int    brdnr;
-        int             brdtype;
+        unsigned int    brdtype;
-        int             state;
+        unsigned int    state;
-        int             nrpanels;
+        unsigned int    nrpanels;
-        int             nrports;
+        unsigned int    nrports;
-        int             nrbnks;
+        unsigned int    nrbnks;
        int             irq;
        int             irqtype;
        int             (*isr)(struct stlbrd *brdp);
@@ -136,9 +136,9 @@ typedef struct stlbrd {
        unsigned long   clk;
        unsigned int    bnkpageaddr[STL_MAXBANKS];
        unsigned int    bnkstataddr[STL_MAXBANKS];
-        stlpanel_t      *bnk2panel[STL_MAXBANKS];
+        struct stlpanel *bnk2panel[STL_MAXBANKS];
-        stlpanel_t      *panels[STL_MAXPANELS];
+        struct stlpanel *panels[STL_MAXPANELS];
-} stlbrd_t;
+};
 /*

diff --git a/include/linux/stallion.h b/include/linux/stallion.h index 13a37f137ea2..4a0a329beafb 100644 --- a/include/linux/stallion.h +++ b/include/linux/stallion.h
@@ -52,11 +52,11 @@
52	* protection - since "write" code only needs to change the head, and	52	* protection - since "write" code only needs to change the head, and
53	* interrupt code only needs to change the tail.	53	* interrupt code only needs to change the tail.
54	*/	54	*/
55	typedef struct {	55	struct stlrq {
56	char *buf;	56	char *buf;
57	char *head;	57	char *head;
58	char *tail;	58	char *tail;
59	} stlrq_t;	59	};
60		60
61	/*	61	/*
62	* Port, panel and board structures to hold status info about each.	62	* Port, panel and board structures to hold status info about each.
@@ -67,14 +67,14 @@ typedef struct {
67	* is associated with, this makes it (fairly) easy to get back to the	67	* is associated with, this makes it (fairly) easy to get back to the
68	* board/panel info for a port.	68	* board/panel info for a port.
69	*/	69	*/
70	typedef struct stlport {	70	struct stlport {
71	unsigned long magic;	71	unsigned long magic;
72	int portnr;	72	unsigned int portnr;
73	int panelnr;	73	unsigned int panelnr;
74	int brdnr;	74	unsigned int brdnr;
75	int ioaddr;	75	int ioaddr;
76	int uartaddr;	76	int uartaddr;
77	int pagenr;	77	unsigned int pagenr;
78	long istate;	78	long istate;
79	int flags;	79	int flags;
80	int baud_base;	80	int baud_base;
@@ -97,31 +97,31 @@ typedef struct stlport {
97	wait_queue_head_t close_wait;	97	wait_queue_head_t close_wait;
98	struct work_struct tqueue;	98	struct work_struct tqueue;
99	comstats_t stats;	99	comstats_t stats;
100	stlrq_t tx;	100	struct stlrq tx;
101	} stlport_t;	101	};
102		102
103	typedef struct stlpanel {	103	struct stlpanel {
104	unsigned long magic;	104	unsigned long magic;
105	int panelnr;	105	unsigned int panelnr;
106	int brdnr;	106	unsigned int brdnr;
107	int pagenr;	107	unsigned int pagenr;
108	int nrports;	108	unsigned int nrports;
109	int iobase;	109	int iobase;
110	void *uartp;	110	void *uartp;
111	void (isr)(struct stlpanel panelp, unsigned int iobase);	111	void (isr)(struct stlpanel panelp, unsigned int iobase);
112	unsigned int hwid;	112	unsigned int hwid;
113	unsigned int ackmask;	113	unsigned int ackmask;
114	stlport_t *ports[STL_PORTSPERPANEL];	114	struct stlport *ports[STL_PORTSPERPANEL];
115	} stlpanel_t;	115	};
116		116
117	typedef struct stlbrd {	117	struct stlbrd {
118	unsigned long magic;	118	unsigned long magic;
119	int brdnr;	119	unsigned int brdnr;
120	int brdtype;	120	unsigned int brdtype;
121	int state;	121	unsigned int state;
122	int nrpanels;	122	unsigned int nrpanels;
123	int nrports;	123	unsigned int nrports;
124	int nrbnks;	124	unsigned int nrbnks;
125	int irq;	125	int irq;
126	int irqtype;	126	int irqtype;
127	int (isr)(struct stlbrd brdp);	127	int (isr)(struct stlbrd brdp);
@@ -136,9 +136,9 @@ typedef struct stlbrd {
136	unsigned long clk;	136	unsigned long clk;
137	unsigned int bnkpageaddr[STL_MAXBANKS];	137	unsigned int bnkpageaddr[STL_MAXBANKS];
138	unsigned int bnkstataddr[STL_MAXBANKS];	138	unsigned int bnkstataddr[STL_MAXBANKS];
139	stlpanel_t *bnk2panel[STL_MAXBANKS];	139	struct stlpanel *bnk2panel[STL_MAXBANKS];
140	stlpanel_t *panels[STL_MAXPANELS];	140	struct stlpanel *panels[STL_MAXPANELS];
141	} stlbrd_t;	141	};
142		142
143		143
144	/*	144	/*