staging: brcm80211: fix "ERROR: trailing statements should be on next line"

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

8 files changed, 54 insertions, 27 deletions

diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index 5d2b1d06d8e3..2c1f61c45221 100644
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -190,12 +190,16 @@ extern int osl_error(int bcmerror);
 			__typeof(*(r)) __osl_v; \
 			__asm__ __volatile__("sync"); \
 			switch (sizeof(*(r))) { \
-			case sizeof(uint8):	__osl_v = \
-				readb((volatile uint8*)(r)); break; \
-			case sizeof(uint16):	__osl_v = \
-				readw((volatile uint16*)(r)); break; \
-			case sizeof(uint32):	__osl_v = \
-				readl((volatile uint32*)(r)); break; \
+			case sizeof(uint8): \
+				__osl_v = readb((volatile uint8*)(r)); \
+				break; \
+			case sizeof(uint16): \
+				__osl_v = readw((volatile uint16*)(r)); \
+				break; \
+			case sizeof(uint32): \
+				__osl_v = \
+				readl((volatile uint32*)(r)); \
+				break; \
 			} \
 			__asm__ __volatile__("sync"); \
 			__osl_v; \
@@ -228,12 +232,17 @@ extern int osl_error(int bcmerror);
 		({ \
 			__typeof(*(r)) __osl_v; \
 			switch (sizeof(*(r))) { \
-			case sizeof(uint8):	__osl_v = \
-				readb((volatile uint8*)((uintptr)(r)^3)); break; \
-			case sizeof(uint16):	__osl_v = \
-				readw((volatile uint16*)((uintptr)(r)^2)); break; \
-			case sizeof(uint32):	__osl_v = \
-				readl((volatile uint32*)(r)); break; \
+			case sizeof(uint8): \
+				__osl_v = \
+				readb((volatile uint8*)((uintptr)(r)^3)); \
+				break; \
+			case sizeof(uint16): \
+				__osl_v = \
+				readw((volatile uint16*)((uintptr)(r)^2)); \
+				break; \
+			case sizeof(uint32): \
+				__osl_v = readl((volatile uint32*)(r)); \
+				break; \
 			} \
 			__osl_v; \
 		}), \
@@ -353,9 +362,15 @@ extern void *osl_pktdup(osl_t *osh, void *skb);
 )
 #define RPC_WRITE_REG(osh, r, v) do { \
 	switch (sizeof(*(r))) { \
-	case sizeof(uint8):	osl_writeb((osh), (volatile uint8*)(r), (uint8)(v)); break; \
-	case sizeof(uint16):	osl_writew((osh), (volatile uint16*)(r), (uint16)(v)); break; \
-	case sizeof(uint32):	osl_writel((osh), (volatile uint32*)(r), (uint32)(v)); break; \
+	case sizeof(uint8): \
+		osl_writeb((osh), (volatile uint8*)(r), (uint8)(v)); \
+		break; \
+	case sizeof(uint16): \
+		osl_writew((osh), (volatile uint16*)(r), (uint16)(v)); \
+		break; \
+	case sizeof(uint32): \
+		osl_writel((osh), (volatile uint32*)(r), (uint32)(v)); \
+		break; \
 	} \
 } while (0)
 
diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h
index 740c3fa7ee14..3305d41298a6 100644
--- a/drivers/staging/brcm80211/include/linuxver.h
+++ b/drivers/staging/brcm80211/include/linuxver.h
@@ -100,7 +100,8 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
 		struct pid *pid;    \
 		pid = find_get_pid((pid_t)nr);    \
 		tsk = pid_task(pid, PIDTYPE_PID);    \
-		if (tsk) send_sig(sig, tsk, 1); \
+		if (tsk) \
+			send_sig(sig, tsk, 1); \
 	} while (0)
 
 #define WL_DEV_IF(dev)          ((wl_if_t*)netdev_priv(dev))
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
index c0b458db87d3..01876ac37069 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
@@ -162,7 +162,8 @@ char *phy_getvar(phy_info_t *pi, const char *name)
 		if ((bcmp(s, name, len) == 0) && (s[len] == '='))
 			return &s[len + 1];
 
-		while (*s++) ;
+		while (*s++)
+			;
 	}
 
 	return nvram_get(name);
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 6498c1304762..186a06dd73f9 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -4385,7 +4385,8 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 			/* validate the name value */
 			name = (char *)arg;
 			for (i = 0; i < (uint) len && *name != '\0';
-			     i++, name++) ;
+			     i++, name++)
+				;
 
 			if (i == (uint) len) {
 				bcmerror = BCME_BUFTOOSHORT;
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index ea4dc1eebcc1..3c812d4436ca 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -199,7 +199,8 @@ static uint16 ipxotp_read_bit(void *oh, chipcregs_t *cc, uint off)
 
 	for (k = 0;
 	     ((st = R_REG(oi->osh, &cc->otpprog)) & OTPP_START_BUSY)
-	     && (k < OTPP_TRIES); k++) ;
+	     && (k < OTPP_TRIES); k++)
+		;
 	if (k >= OTPP_TRIES) {
 		return 0xffff;
 	}
@@ -259,7 +260,8 @@ static void BCMNMIATTACHFN(_ipxotp_init) (otpinfo_t *oi, chipcregs_t *cc)
 	W_REG(oi->osh, &cc->otpprog, otpp);
 	for (k = 0;
 	     ((st = R_REG(oi->osh, &cc->otpprog)) & OTPP_START_BUSY)
-	     && (k < OTPP_TRIES); k++) ;
+	     && (k < OTPP_TRIES); k++)
+		;
 	if (k >= OTPP_TRIES) {
 		return;
 	}
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index d800ca501ed9..59aa65bfcb17 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -137,7 +137,8 @@ static int BCMATTACHFN(varbuf_append) (varbuf_t *b, const char *fmt, ...)
 				break;
 			}
 
-			while (*s++) ;
+			while (*s++)
+				;
 		}
 	}
 
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 64e71b9aa4d5..7f24fa71e732 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -106,7 +106,8 @@ uint BCMFASTPATH pkttotlen(osl_t *osh, void *p)
 /* return the last buffer of chained pkt */
 void *pktlast(osl_t *osh, void *p)
 {
-	for (; PKTNEXT(p); p = PKTNEXT(p)) ;
+	for (; PKTNEXT(p); p = PKTNEXT(p))
+		;
 
 	return p;
 }
@@ -286,7 +287,8 @@ bool BCMFASTPATH pktq_pdel(struct pktq *pq, void *pktbuf, int prec)
 		if (q->head == NULL)
 			q->tail = NULL;
 	} else {
-		for (p = q->head; p && PKTLINK(p) != pktbuf; p = PKTLINK(p)) ;
+		for (p = q->head; p && PKTLINK(p) != pktbuf; p = PKTLINK(p))
+			;
 		if (p == NULL)
 			return FALSE;
 
@@ -619,7 +621,8 @@ char *BCMROMFN(bcmstrcat) (char *dest, const char *src)
 
 	p = dest + strlen(dest);
 
-	while ((*p++ = *src++) != '\0') ;
+	while ((*p++ = *src++) != '\0')
+		;
 
 	return dest;
 }
@@ -632,7 +635,8 @@ char *BCMROMFN(bcmstrncat) (char *dest, const char *src, uint size)
 	p = dest + strlen(dest);
 	endp = p + size;
 
-	while (p != endp && (*p++ = *src++) != '\0') ;
+	while (p != endp && (*p++ = *src++) != '\0')
+		;
 
 	return dest;
 }
@@ -841,7 +845,8 @@ char *getvar(char *vars, const char *name)
 		if ((bcmp(s, name, len) == 0) && (s[len] == '='))
 			return &s[len + 1];
 
-		while (*s++) ;
+		while (*s++)
+			;
 	}
 
 	/* then query nvram */
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index 12983c4abb14..86832e1a5912 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@ -135,7 +135,8 @@ static char *findvar(char *vars, char *lim, const char *name)
 		if ((bcmp(s, name, len) == 0) && (s[len] == '='))
 			return &s[len + 1];
 
-		while (*s++) ;
+		while (*s++)
+			;
 	}
 
 	return NULL;