From 11208b0b3a9ddc462795bdb3aadfc0eda8ef2e4b Mon Sep 17 00:00:00 2001 From: Nicholas Parkanyi Date: Sun, 12 Jul 2015 08:17:52 -0400 Subject: [PATCH] Staging: vt6655: Remove do { } while (0) from single-statement macros in upc.h. This patch fixes checkpatch.pl warnings in upc.h regarding single-statement macros embedded within do { } while (0) blocks. Signed-off-by: Nicholas Parkanyi Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/upc.h | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index cc63dc8..85fe046 100644 --- 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 { \ -- 2.7.4