1 files changed, 18 insertions, 18 deletions
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index b55e2a035605..106a5e85e5c4 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -49,13 +49,13 @@
 *      communication with the slave board will always be on a per port
 *      basis.
 */
-typedef struct {
+struct stliport {
        unsigned long           magic;
-        int                     portnr;
+        unsigned int            portnr;
-        int                     panelnr;
+        unsigned int            panelnr;
-        int                     brdnr;
+        unsigned int            brdnr;
        unsigned long           state;
-        int                     devnr;
+        unsigned int            devnr;
        int                     flags;
        int                     baud_base;
        int                     custom_divisor;
@@ -72,7 +72,7 @@ typedef struct {
        wait_queue_head_t       close_wait;
        wait_queue_head_t       raw_wait;
        struct work_struct      tqhangup;
-        asysigs_t               asig;
+        struct asysigs          asig;
        unsigned long           addr;
        unsigned long           rxoffset;
        unsigned long           txoffset;
@@ -83,31 +83,31 @@ typedef struct {
        unsigned char           reqbit;
        unsigned char           portidx;
        unsigned char           portbit;
-} stliport_t;
+};
 /*
 *      Use a structure of function pointers to do board level operations.
 *      These include, enable/disable, paging shared memory, interrupting, etc.
 */
-typedef struct stlibrd {
+struct stlibrd {
        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             nrdevs;
+        unsigned int    nrdevs;
        unsigned int    iobase;
        int             iosize;
        unsigned long   memaddr;
        void            __iomem *membase;
-        int             memsize;
+        unsigned long   memsize;
        int             pagesize;
        int             hostoffset;
        int             slaveoffset;
        int             bitsize;
        int             enabval;
-        int             panels[STL_MAXPANELS];
+        unsigned int    panels[STL_MAXPANELS];
        int             panelids[STL_MAXPANELS];
        void            (*init)(struct stlibrd *brdp);
        void            (*enable)(struct stlibrd *brdp);
@@ -116,8 +116,8 @@ typedef struct stlibrd {
        void            __iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);
        void            (*intr)(struct stlibrd *brdp);
        void            (*reset)(struct stlibrd *brdp);
-        stliport_t      *ports[STL_MAXPORTS];
+        struct stliport *ports[STL_MAXPORTS];
-} stlibrd_t;
+};
 /*

diff --git a/include/linux/istallion.h b/include/linux/istallion.h index b55e2a035605..106a5e85e5c4 100644 --- a/include/linux/istallion.h +++ b/include/linux/istallion.h
@@ -49,13 +49,13 @@
49	* communication with the slave board will always be on a per port	49	* communication with the slave board will always be on a per port
50	* basis.	50	* basis.
51	*/	51	*/
52	typedef struct {	52	struct stliport {
53	unsigned long magic;	53	unsigned long magic;
54	int portnr;	54	unsigned int portnr;
55	int panelnr;	55	unsigned int panelnr;
56	int brdnr;	56	unsigned int brdnr;
57	unsigned long state;	57	unsigned long state;
58	int devnr;	58	unsigned int devnr;
59	int flags;	59	int flags;
60	int baud_base;	60	int baud_base;
61	int custom_divisor;	61	int custom_divisor;
@@ -72,7 +72,7 @@ typedef struct {
72	wait_queue_head_t close_wait;	72	wait_queue_head_t close_wait;
73	wait_queue_head_t raw_wait;	73	wait_queue_head_t raw_wait;
74	struct work_struct tqhangup;	74	struct work_struct tqhangup;
75	asysigs_t asig;	75	struct asysigs asig;
76	unsigned long addr;	76	unsigned long addr;
77	unsigned long rxoffset;	77	unsigned long rxoffset;
78	unsigned long txoffset;	78	unsigned long txoffset;
@@ -83,31 +83,31 @@ typedef struct {
83	unsigned char reqbit;	83	unsigned char reqbit;
84	unsigned char portidx;	84	unsigned char portidx;
85	unsigned char portbit;	85	unsigned char portbit;
86	} stliport_t;	86	};
87		87
88	/*	88	/*
89	* Use a structure of function pointers to do board level operations.	89	* Use a structure of function pointers to do board level operations.
90	* These include, enable/disable, paging shared memory, interrupting, etc.	90	* These include, enable/disable, paging shared memory, interrupting, etc.
91	*/	91	*/
92	typedef struct stlibrd {	92	struct stlibrd {
93	unsigned long magic;	93	unsigned long magic;
94	int brdnr;	94	unsigned int brdnr;
95	int brdtype;	95	unsigned int brdtype;
96	int state;	96	unsigned int state;
97	int nrpanels;	97	unsigned int nrpanels;
98	int nrports;	98	unsigned int nrports;
99	int nrdevs;	99	unsigned int nrdevs;
100	unsigned int iobase;	100	unsigned int iobase;
101	int iosize;	101	int iosize;
102	unsigned long memaddr;	102	unsigned long memaddr;
103	void __iomem *membase;	103	void __iomem *membase;
104	int memsize;	104	unsigned long memsize;
105	int pagesize;	105	int pagesize;
106	int hostoffset;	106	int hostoffset;
107	int slaveoffset;	107	int slaveoffset;
108	int bitsize;	108	int bitsize;
109	int enabval;	109	int enabval;
110	int panels[STL_MAXPANELS];	110	unsigned int panels[STL_MAXPANELS];
111	int panelids[STL_MAXPANELS];	111	int panelids[STL_MAXPANELS];
112	void (init)(struct stlibrd brdp);	112	void (init)(struct stlibrd brdp);
113	void (enable)(struct stlibrd brdp);	113	void (enable)(struct stlibrd brdp);
@@ -116,8 +116,8 @@ typedef struct stlibrd {
116	void __iomem (getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);	116	void __iomem (getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);
117	void (intr)(struct stlibrd brdp);	117	void (intr)(struct stlibrd brdp);
118	void (reset)(struct stlibrd brdp);	118	void (reset)(struct stlibrd brdp);
119	stliport_t *ports[STL_MAXPORTS];	119	struct stliport *ports[STL_MAXPORTS];
120	} stlibrd_t;	120	};
121		121
122		122
123	/*	123	/*