staging: vt6655: Fix macro definitions

Macros should be able to be used in if/else
without braces.

Convert macros to use do {} while (0) instead
of bare braces where appropriate.

Convert macros to use single line macro definitions
where appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/vt6655/baseband.h

@@ -72,14 +72,10 @@
 /*---------------------  Export Macros ------------------------------*/
 
 #define BBvClearFOE(dwIoBase)				\
-	{						\
-		BBbWriteEmbedded(dwIoBase, 0xB1, 0);	\
-	}
+	BBbWriteEmbedded(dwIoBase, 0xB1, 0)
 
 #define BBvSetFOE(dwIoBase)				\
-	{						\
-		BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C);	\
-	}
+	BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C)
 
 
 /*---------------------  Export Classes  ----------------------------*/

drivers/staging/vt6655/device_cfg.h

@@ -83,13 +83,14 @@ typedef enum  _chip_type {
 
 
 #ifdef VIAWET_DEBUG
-#define ASSERT(x) {							\
-		if (!(x)) {						\
-			printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x, \
-			       __FUNCTION__, __LINE__);			\
-			*(int *)0 = 0;					\
-		}							\
-	}
+#define ASSERT(x)							\
+do {									\
+	if (!(x)) {							\
+		printk(KERN_ERR "assertion %s failed: file %s line %d\n", \
+		       #x, __func__, __LINE__);				\
+		*(int *)0 = 0;						\
+	}								\
+} while (0)
 #define DBG_PORT80(value)                   outb(value, 0x80)
 #else
 #define ASSERT(x)

drivers/staging/vt6655/upc.h

@@ -41,32 +41,29 @@
 
 #ifdef IO_MAP
 
-#define VNSvInPortB(dwIOAddress, pbyData) {	\
-		*(pbyData) = inb(dwIOAddress);	\
-	}
+#define VNSvInPortB(dwIOAddress, pbyData)	\
+do {						\
+	*(pbyData) = inb(dwIOAddress);		\
+} while (0)
 
+#define VNSvInPortW(dwIOAddress, pwData)	\
+do {						\
+	*(pwData) = inw(dwIOAddress);		\
+} while (0)
 
-#define VNSvInPortW(dwIOAddress, pwData) {	\
-		*(pwData) = inw(dwIOAddress);	\
-	}
+#define VNSvInPortD(dwIOAddress, pdwData)	\
+do {						\
+	*(pdwData) = inl(dwIOAddress);		\
+} while (0)
 
-#define VNSvInPortD(dwIOAddress, pdwData) {	\
-		*(pdwData) = inl(dwIOAddress);	\
-	}
+#define VNSvOutPortB(dwIOAddress, byData)	\
+	outb(byData, dwIOAddress)
 
+#define VNSvOutPortW(dwIOAddress, wData)	\
+	outw(wData, dwIOAddress)
 
-#define VNSvOutPortB(dwIOAddress, byData) {	\
-		outb(byData, dwIOAddress);	\
-	}
-
-
-#define VNSvOutPortW(dwIOAddress, wData) {	\
-		outw(wData, dwIOAddress);	\
-	}
-
-#define VNSvOutPortD(dwIOAddress, dwData) {	\
-		outl(dwData, dwIOAddress);	\
-	}
+#define VNSvOutPortD(dwIOAddress, dwData)	\
+	outl(dwData, dwIOAddress)
 
 #else
 
@@ -75,38 +72,43 @@
 //
 
 
-#define VNSvInPortB(dwIOAddress, pbyData) {				\
-		volatile unsigned char *pbyAddr = ((unsigned char *)(dwIOAddress)); \
-		*(pbyData) = readb(pbyAddr);				\
-	}
+#define VNSvInPortB(dwIOAddress, pbyData)				\
+do {									\
+	volatile unsigned char *pbyAddr = (unsigned char *)(dwIOAddress); \
+	*(pbyData) = readb(pbyAddr);					\
+} while (0)
 
 
-#define VNSvInPortW(dwIOAddress, pwData) {				\
-		volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \
-		*(pwData) = readw(pwAddr);				\
-	}
+#define VNSvInPortW(dwIOAddress, pwData)				\
+do {									\
+	volatile unsigned short *pwAddr = (unsigned short *)(dwIOAddress); \
+	*(pwData) = readw(pwAddr);					\
+} while (0)
 
-#define VNSvInPortD(dwIOAddress, pdwData) {				\
-		volatile unsigned long *pdwAddr = ((unsigned long *)(dwIOAddress)); \
-		*(pdwData) = readl(pdwAddr);				\
-	}
+#define VNSvInPortD(dwIOAddress, pdwData)				\
+do {									\
+	volatile unsigned long *pdwAddr = (unsigned long *)(dwIOAddress); \
+	*(pdwData) = readl(pdwAddr);					\
+} while (0)
 
+#define VNSvOutPortB(dwIOAddress, byData)				\
+do {									\
+	volatile unsigned char *pbyAddr = (unsigned char *)(dwIOAddress); \
+	writeb((unsigned char)byData, pbyAddr);				\
+} while (0)
 
-#define VNSvOutPortB(dwIOAddress, byData) {				\
-		volatile unsigned char *pbyAddr = ((unsigned char *)(dwIOAddress)); \
-		writeb((unsigned char)byData, pbyAddr);			\
-	}
 
+#define VNSvOutPortW(dwIOAddress, wData)				\
+do {									\
+	volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \
+	writew((unsigned short)wData, pwAddr);				\
+} while (0)
 
-#define VNSvOutPortW(dwIOAddress, wData) {				\
-		volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \
-		writew((unsigned short)wData, pwAddr);			\
-	}
-
-#define VNSvOutPortD(dwIOAddress, dwData) {				\
-		volatile unsigned long *pdwAddr = ((unsigned long *)(dwIOAddress)); \
-		writel((unsigned long)dwData, pdwAddr);			\
-	}
+#define VNSvOutPortD(dwIOAddress, dwData)				\
+do {									\
+	volatile unsigned long *pdwAddr = (unsigned long *)(dwIOAddress); \
+	writel((unsigned long)dwData, pdwAddr);				\
+} while (0)
 
 #endif
 
@@ -114,43 +116,42 @@
 //
 // ALWAYS IO-Mapped IO when in 16-bit/32-bit environment
 //
-#define PCBvInPortB(dwIOAddress, pbyData) {     \
-		*(pbyData) = inb(dwIOAddress);	\
-	}
-
-#define PCBvInPortW(dwIOAddress, pwData) {      \
-		*(pwData) = inw(dwIOAddress);	\
-	}
-
-#define PCBvInPortD(dwIOAddress, pdwData) {     \
-		*(pdwData) = inl(dwIOAddress);	\
-	}
-
-#define PCBvOutPortB(dwIOAddress, byData) {     \
-		outb(byData, dwIOAddress);	\
-	}
-
-#define PCBvOutPortW(dwIOAddress, wData) {      \
-		outw(wData, dwIOAddress);	\
-	}
-
-#define PCBvOutPortD(dwIOAddress, dwData) {     \
-		outl(dwData, dwIOAddress);	\
-	}
-
-
-#define PCAvDelayByIO(uDelayUnit) {				\
-		unsigned char byData;				\
-		unsigned long ii;				\
+#define PCBvInPortB(dwIOAddress, pbyData)	\
+do {						\
+	*(pbyData) = inb(dwIOAddress);		\
+} while (0)
+
+#define PCBvInPortW(dwIOAddress, pwData)	\
+do {						\
+	*(pwData) = inw(dwIOAddress);		\
+} while (0)
+
+#define PCBvInPortD(dwIOAddress, pdwData)	\
+do {						\
+	*(pdwData) = inl(dwIOAddress);		\
+} while (0)
+
+#define PCBvOutPortB(dwIOAddress, byData)	\
+	outb(byData, dwIOAddress)
+
+#define PCBvOutPortW(dwIOAddress, wData)	\
+	outw(wData, dwIOAddress)
+
+#define PCBvOutPortD(dwIOAddress, dwData)	\
+	outl(dwData, dwIOAddress)
+
+#define PCAvDelayByIO(uDelayUnit)				\
+do {								\
+	unsigned char byData;					\
+	unsigned long ii;					\
 								\
-		if (uDelayUnit <= 50) {				\
-			udelay(uDelayUnit);                     \
-		}						\
-		else {						\
-			for (ii = 0; ii < (uDelayUnit); ii++)   \
-				byData = inb(0x61);		\
-		}						\
-	}
+	if (uDelayUnit <= 50) {					\
+		udelay(uDelayUnit);				\
+	} else {						\
+		for (ii = 0; ii < (uDelayUnit); ii++)		\
+			byData = inb(0x61);			\
+	}							\
+} while (0)
 
 
 /*---------------------  Export Classes  ----------------------------*/

drivers/staging/vt6655/wctl.h

@@ -83,12 +83,13 @@
 	((((PS802_11Header) pMACHeader)->wFrameCtl & TYPE_SUBTYPE_MASK) == TYPE_CTL_PSPOLL)
 
 
-#define ADD_ONE_WITH_WRAP_AROUND(uVar, uModulo) {	\
-		if ((uVar) >= ((uModulo) - 1))		\
-			(uVar) = 0;			\
-		else					\
-			(uVar)++;			\
-	}
+#define ADD_ONE_WITH_WRAP_AROUND(uVar, uModulo)		\
+do {							\
+	if ((uVar) >= ((uModulo) - 1))			\
+		(uVar) = 0;				\
+	else						\
+		(uVar)++;				\
+} while (0)
 
 
 /*---------------------  Export Classes  ----------------------------*/