Merge tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[karo-tx-linux.git] / drivers / staging / vt6655 / upc.h

diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h
index cc63dc8d47f713a46e8dbb041991cc7b7f1a7f12..85fe0464cfb3a20a44dfab6cb3020d2d4b87f6da 100644 (file)
--- a/drivers/staging/vt6655/upc.h
+++ b/drivers/staging/vt6655/upc.h
@@ -37,35 +37,23 @@
 /* For memory mapped IO */
 
 
-#define VNSvInPortB(dwIOAddress, pbyData)                              \
-do {                                                                   \
-       *(pbyData) = ioread8(dwIOAddress);                              \
-} while (0)
+#define VNSvInPortB(dwIOAddress, pbyData) \
+       (*(pbyData) = ioread8(dwIOAddress))
 
-#define VNSvInPortW(dwIOAddress, pwData)                               \
-do {                                                                   \
-       *(pwData) = ioread16(dwIOAddress);                              \
-} while (0)
+#define VNSvInPortW(dwIOAddress, pwData) \
+       (*(pwData) = ioread16(dwIOAddress))
 
-#define VNSvInPortD(dwIOAddress, pdwData)                              \
-do {                                                                   \
-       *(pdwData) = ioread32(dwIOAddress);                             \
-} while (0)
+#define VNSvInPortD(dwIOAddress, pdwData) \
+       (*(pdwData) = ioread32(dwIOAddress))
 
-#define VNSvOutPortB(dwIOAddress, byData)                              \
-do {                                                                   \
-       iowrite8((u8)byData, dwIOAddress);                              \
-} while (0)
+#define VNSvOutPortB(dwIOAddress, byData) \
+       iowrite8((u8)(byData), dwIOAddress)
 
-#define VNSvOutPortW(dwIOAddress, wData)                               \
-do {                                                                   \
-       iowrite16((u16)wData, dwIOAddress);                             \
-} while (0)
+#define VNSvOutPortW(dwIOAddress, wData) \
+       iowrite16((u16)(wData), dwIOAddress)
 
-#define VNSvOutPortD(dwIOAddress, dwData)                              \
-do {                                                                   \
-       iowrite32((u32)dwData, dwIOAddress);                            \
-} while (0)
+#define VNSvOutPortD(dwIOAddress, dwData) \
+       iowrite32((u32)(dwData), dwIOAddress)
 
 #define PCAvDelayByIO(uDelayUnit)                              \
 do {                                                           \