[PATCH] lindent rio drivers

Run all rio files through indent -kr -i8 -bri0 -l255, as requested by Alan. rioboot.c and rioinit.c were skipped due to worrisome lindent warnings. Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
author: Andrew Morton <akpm@osdl.org> 2006-01-11 15:17:49 -0500
committer: Linus Torvalds <torvalds@g5.osdl.org> 2006-01-11 21:42:14 -0500
commit: 8d8706e2f86d28814c1b40a116ffdeca35e4c949 (patch)
tree: 146567d7a807feb37a5368fbb4a6ee76d9d7bc7e /drivers/char/rio/host.h
parent: a9415644583ef344e02f84faf5fe24bfadb2af8e (diff)
1 files changed, 46 insertions, 47 deletions
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h
index 4c65963870a4..f7dfcedf7d45 100644
--- a/drivers/char/rio/host.h
+++ b/drivers/char/rio/host.h
@@ -49,33 +49,32 @@ static char *_host_h_sccs_ = "@(#)host.h	1.2";
 **    Host data structure. This is used for the software equiv. of
 **    the host.
 */
-struct    Host
+struct Host {
-{
+        uchar Type;             /* RIO_EISA, RIO_MCA, ... */
-    uchar                   Type;      /* RIO_EISA, RIO_MCA, ... */
+        uchar Ivec;             /* POLLED or ivec number */
-    uchar                   Ivec;      /* POLLED or ivec number */
+        uchar Mode;             /* Control stuff */
-    uchar                   Mode;      /* Control stuff */
+        uchar Slot;             /* Slot */
-    uchar                   Slot;      /* Slot */
+        volatile caddr_t Caddr; /* KV address of DPRAM */
-    volatile caddr_t        Caddr;     /* KV address of DPRAM */
+        volatile struct DpRam *CardP;   /* KV address of DPRAM, with overlay */
-    volatile 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 */
-    char                    Name[MAX_NAME_LEN];  /* The name of the host */
+        uint UniqueNum;         /* host unique number */
-    uint                    UniqueNum; /* host unique number */
+        spinlock_t HostLock;    /* Lock structure for MPX */
-    spinlock_t              HostLock;  /* Lock structure for MPX */
+        /*struct pci_devinfo    PciDevInfo; *//* PCI Bus/Device/Function stuff */
-    /*struct pci_devinfo    PciDevInfo; *//* PCI Bus/Device/Function stuff */
+        /*struct lockb          HostLock;  *//* Lock structure for MPX */
-    /*struct lockb          HostLock;  *//* Lock structure for MPX */
+        uint WorkToBeDone;      /* set to true each interrupt */
-    uint                    WorkToBeDone; /* set to true each interrupt */
+        uint InIntr;            /* Being serviced? */
-    uint                    InIntr;    /* Being serviced? */
+        uint IntSrvDone;        /* host's interrupt has been serviced */
-    uint                    IntSrvDone;/* host's interrupt has been serviced */
+        int (*Copy) (caddr_t, caddr_t, int);    /* copy func */
-    int                     (*Copy)( caddr_t, caddr_t, int ); /* copy func */
+        struct timer_list timer;
-    struct timer_list timer;
+        /*
-    /*
+         **               I M P O R T A N T !
-    **               I M P O R T A N T !
+         **
-    **
+         ** The rest of this data structure is cleared to zero after
-    ** The rest of this data structure is cleared to zero after
+         ** a RIO_HOST_FOAD command.
-    ** a RIO_HOST_FOAD command.
+         */
-    */
-    
+        ulong Flags;            /* Whats going down */
-    ulong                   Flags;     /* Whats going down */
 #define RC_WAITING            0
 #define RC_STARTUP            1
 #define RC_RUNNING            2
@@ -93,25 +92,25 @@ struct    Host
 #define RC_BOOT_OWN           0x10      /* Only boot RTAs bound to this system */
 #define RC_BOOT_NONE          0x20      /* Don't boot any RTAs (slave mode) */
-    struct Top              Topology[LINKS_PER_UNIT]; /* one per link */
+        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 */
+        ushort *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 */
+        uint ExtraUnits[MAX_EXTRA_UNITS];       /* unknown things */
-    uint                    NumExtraBooted;       /* how many of the above */
+        uint NumExtraBooted;    /* how many of the above */
-    /*
+        /*
-    ** Twenty logical rups.
+         ** Twenty logical rups.
-    ** The first sixteen are the real Rup entries (above), the last four
+         ** The first sixteen are the real Rup entries (above), the last four
-    ** are the link RUPs.
+         ** are the link RUPs.
-    */
+         */
-    struct UnixRup          UnixRups[MAX_RUP+LINKS_PER_UNIT];
+        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____;
+        char ____end_marker____;
 };
 #define Control      CardP->DpControl
 #define SetInt       CardP->DpSetInt
@@ -129,6 +128,6 @@ struct    Host
 #define Year         CardP->DpYear
 #define Week         CardP->DpWeek
-#define RIO_DUMBPARM 0x0860    /* what not to expect */
+#define RIO_DUMBPARM 0x0860     /* what not to expect */
 #endif
author	Andrew Morton <akpm@osdl.org>	2006-01-11 15:17:49 -0500
committer	Linus Torvalds <torvalds@g5.osdl.org>	2006-01-11 21:42:14 -0500
commit	8d8706e2f86d28814c1b40a116ffdeca35e4c949 (patch)
tree	146567d7a807feb37a5368fbb4a6ee76d9d7bc7e /drivers/char/rio/host.h
parent	a9415644583ef344e02f84faf5fe24bfadb2af8e (diff)

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