1 files changed, 27 insertions, 29 deletions
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h
index f7dfcedf7d45..79a55301f06b 100644
--- a/drivers/char/rio/host.h
+++ b/drivers/char/rio/host.h
@@ -50,22 +50,20 @@ static char *_host_h_sccs_ = "@(#)host.h	1.2";
 **    the host.
 */
 struct Host {
-        uchar Type;             /* RIO_EISA, RIO_MCA, ... */
+        unsigned char Type;             /* RIO_EISA, RIO_MCA, ... */
-        uchar Ivec;             /* POLLED or ivec number */
+        unsigned char Ivec;             /* POLLED or ivec number */
-        uchar Mode;             /* Control stuff */
+        unsigned char Mode;             /* Control stuff */
-        uchar Slot;             /* Slot */
+        unsigned char Slot;             /* Slot */
-        volatile caddr_t Caddr; /* KV address of DPRAM */
+        caddr_t Caddr;                  /* KV address of DPRAM */
-        volatile struct DpRam *CardP;   /* KV address of DPRAM, with overlay */
+        struct DpRam *CardP;            /* KV address of DPRAM, with overlay */
-        paddr_t PaddrP;         /* Phys. address of DPRAM */
+        paddr_t PaddrP;                 /* Phys. address of DPRAM */
        char Name[MAX_NAME_LEN];        /* The name of the host */
-        uint UniqueNum;         /* host unique number */
+        unsigned int UniqueNum;         /* host unique number */
        spinlock_t HostLock;    /* Lock structure for MPX */
-        /*struct pci_devinfo    PciDevInfo; *//* PCI Bus/Device/Function stuff */
+        unsigned int WorkToBeDone;      /* set to true each interrupt */
-        /*struct lockb          HostLock;  *//* Lock structure for MPX */
+        unsigned int InIntr;            /* Being serviced? */
-        uint WorkToBeDone;      /* set to true each interrupt */
+        unsigned int IntSrvDone;        /* host's interrupt has been serviced */
-        uint InIntr;            /* Being serviced? */
+        void (*Copy) (void *, void *, int);     /* copy func */
-        uint IntSrvDone;        /* host's interrupt has been serviced */
-        int (*Copy) (caddr_t, caddr_t, int);    /* copy func */
        struct timer_list timer;
        /*
         **               I M P O R T A N T !
@@ -74,7 +72,7 @@ struct Host {
         ** a RIO_HOST_FOAD command.
         */
-        ulong Flags;            /* Whats going down */
+        unsigned long Flags;                    /* Whats going down */
 #define RC_WAITING            0
 #define RC_STARTUP            1
 #define RC_RUNNING            2
@@ -88,28 +86,28 @@ struct Host {
 ** Boot mode applies to the way in which hosts in this system will
 ** boot RTAs
 */
-#define RC_BOOT_ALL           0x8       /* Boot all RTAs attached */
+#define RC_BOOT_ALL           0x8               /* Boot all RTAs attached */
-#define RC_BOOT_OWN           0x10      /* Only boot RTAs bound to this system */
+#define RC_BOOT_OWN           0x10              /* Only boot RTAs bound to this system */
-#define RC_BOOT_NONE          0x20      /* Don't boot any RTAs (slave mode) */
+#define RC_BOOT_NONE          0x20              /* Don't boot any RTAs (slave mode) */
        struct Top Topology[LINKS_PER_UNIT];    /* one per link */
-        struct Map Mapping[MAX_RUP];    /* Mappings for host */
+        struct Map Mapping[MAX_RUP];            /* Mappings for host */
-        struct PHB *PhbP;       /* Pointer to the PHB array */
+        struct PHB *PhbP;                       /* Pointer to the PHB array */
-        ushort *PhbNumP;        /* Ptr to Number of PHB's */
+        unsigned short *PhbNumP;                /* Ptr to Number of PHB's */
-        struct LPB *LinkStrP;   /* Link Structure Array */
+        struct LPB *LinkStrP;                   /* Link Structure Array */
-        struct RUP *RupP;       /* Sixteen real rups here */
+        struct RUP *RupP;                       /* Sixteen real rups here */
-        struct PARM_MAP *ParmMapP;      /* points to the parmmap */
+        struct PARM_MAP *ParmMapP;              /* points to the parmmap */
-        uint ExtraUnits[MAX_EXTRA_UNITS];       /* unknown things */
+        unsigned int ExtraUnits[MAX_EXTRA_UNITS];       /* unknown things */
-        uint NumExtraBooted;    /* how many of the above */
+        unsigned int NumExtraBooted;            /* how many of the above */
        /*
         ** Twenty logical rups.
         ** The first sixteen are the real Rup entries (above), the last four
         ** are the link RUPs.
         */
        struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];
-        int timeout_id;         /* For calling 100 ms delays */
+        int timeout_id;                         /* For calling 100 ms delays */
-        int timeout_sem;        /* For calling 100 ms delays */
+        int timeout_sem;                        /* For calling 100 ms delays */
-        long locks;             /* long req'd for set_bit --RR */
+        long locks;                             /* long req'd for set_bit --RR */
        char ____end_marker____;
 };
 #define Control      CardP->DpControl

diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h index f7dfcedf7d45..79a55301f06b 100644 --- a/drivers/char/rio/host.h +++ b/drivers/char/rio/host.h
@@ -50,22 +50,20 @@ static char *_host_h_sccs_ = "@(#)host.h 1.2";
50	** the host.	50	** the host.
51	*/	51	*/
52	struct Host {	52	struct Host {
53	uchar Type; /* RIO_EISA, RIO_MCA, ... */	53	unsigned char Type; /* RIO_EISA, RIO_MCA, ... */
54	uchar Ivec; /* POLLED or ivec number */	54	unsigned char Ivec; /* POLLED or ivec number */
55	uchar Mode; /* Control stuff */	55	unsigned char Mode; /* Control stuff */
56	uchar Slot; /* Slot */	56	unsigned char Slot; /* Slot */
57	volatile caddr_t Caddr; /* KV address of DPRAM */	57	caddr_t Caddr; /* KV address of DPRAM */
58	volatile struct DpRam CardP; / KV address of DPRAM, with overlay */	58	struct DpRam CardP; / KV address of DPRAM, with overlay */
59	paddr_t PaddrP; /* Phys. address of DPRAM */	59	paddr_t PaddrP; /* Phys. address of DPRAM */
60	char Name[MAX_NAME_LEN]; /* The name of the host */	60	char Name[MAX_NAME_LEN]; /* The name of the host */
61	uint UniqueNum; /* host unique number */	61	unsigned int UniqueNum; /* host unique number */
62	spinlock_t HostLock; /* Lock structure for MPX */	62	spinlock_t HostLock; /* Lock structure for MPX */
63	/struct pci_devinfo PciDevInfo; //* PCI Bus/Device/Function stuff */	63	unsigned int WorkToBeDone; /* set to true each interrupt */
64	/struct lockb HostLock; //* Lock structure for MPX */	64	unsigned int InIntr; /* Being serviced? */
65	uint WorkToBeDone; /* set to true each interrupt */	65	unsigned int IntSrvDone; /* host's interrupt has been serviced */
66	uint InIntr; /* Being serviced? */	66	void (Copy) (void , void , int); / copy func */
67	uint IntSrvDone; /* host's interrupt has been serviced */
68	int (Copy) (caddr_t, caddr_t, int); / copy func */
69	struct timer_list timer;	67	struct timer_list timer;
70	/*	68	/*
71	** I M P O R T A N T !	69	** I M P O R T A N T !
@@ -74,7 +72,7 @@ struct Host {
74	** a RIO_HOST_FOAD command.	72	** a RIO_HOST_FOAD command.
75	*/	73	*/
76		74
77	ulong Flags; /* Whats going down */	75	unsigned long Flags; /* Whats going down */
78	#define RC_WAITING 0	76	#define RC_WAITING 0
79	#define RC_STARTUP 1	77	#define RC_STARTUP 1
80	#define RC_RUNNING 2	78	#define RC_RUNNING 2
@@ -88,28 +86,28 @@ struct Host {
88	** Boot mode applies to the way in which hosts in this system will	86	** Boot mode applies to the way in which hosts in this system will
89	** boot RTAs	87	** boot RTAs
90	*/	88	*/
91	#define RC_BOOT_ALL 0x8 /* Boot all RTAs attached */	89	#define RC_BOOT_ALL 0x8 /* Boot all RTAs attached */
92	#define RC_BOOT_OWN 0x10 /* Only boot RTAs bound to this system */	90	#define RC_BOOT_OWN 0x10 /* Only boot RTAs bound to this system */
93	#define RC_BOOT_NONE 0x20 /* Don't boot any RTAs (slave mode) */	91	#define RC_BOOT_NONE 0x20 /* Don't boot any RTAs (slave mode) */
94		92
95	struct Top Topology[LINKS_PER_UNIT]; /* one per link */	93	struct Top Topology[LINKS_PER_UNIT]; /* one per link */
96	struct Map Mapping[MAX_RUP]; /* Mappings for host */	94	struct Map Mapping[MAX_RUP]; /* Mappings for host */
97	struct PHB PhbP; / Pointer to the PHB array */	95	struct PHB PhbP; / Pointer to the PHB array */
98	ushort PhbNumP; / Ptr to Number of PHB's */	96	unsigned short PhbNumP; / Ptr to Number of PHB's */
99	struct LPB LinkStrP; / Link Structure Array */	97	struct LPB LinkStrP; / Link Structure Array */
100	struct RUP RupP; / Sixteen real rups here */	98	struct RUP RupP; / Sixteen real rups here */
101	struct PARM_MAP ParmMapP; / points to the parmmap */	99	struct PARM_MAP ParmMapP; / points to the parmmap */
102	uint ExtraUnits[MAX_EXTRA_UNITS]; /* unknown things */	100	unsigned int ExtraUnits[MAX_EXTRA_UNITS]; /* unknown things */
103	uint NumExtraBooted; /* how many of the above */	101	unsigned int NumExtraBooted; /* how many of the above */
104	/*	102	/*
105	** Twenty logical rups.	103	** Twenty logical rups.
106	** The first sixteen are the real Rup entries (above), the last four	104	** The first sixteen are the real Rup entries (above), the last four
107	** are the link RUPs.	105	** are the link RUPs.
108	*/	106	*/
109	struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];	107	struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];
110	int timeout_id; /* For calling 100 ms delays */	108	int timeout_id; /* For calling 100 ms delays */
111	int timeout_sem; /* For calling 100 ms delays */	109	int timeout_sem; /* For calling 100 ms delays */
112	long locks; /* long req'd for set_bit --RR */	110	long locks; /* long req'd for set_bit --RR */
113	char ____end_marker____;	111	char ____end_marker____;
114	};	112	};
115	#define Control CardP->DpControl	113	#define Control CardP->DpControl