aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/device_cfg.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-18 20:55:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 11:16:17 -0700
commitbda2a44e2a015535f08aecd5c98e263098db9e75 (patch)
tree91d4d579caa514fd2296750e1003e54f9eb75d31 /drivers/staging/vt6655/device_cfg.h
parentstaging: vt6655: Remove commented out if()s (diff)
downloadlinux-dev-bda2a44e2a015535f08aecd5c98e263098db9e75.tar.xz
linux-dev-bda2a44e2a015535f08aecd5c98e263098db9e75.zip
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>
Diffstat (limited to 'drivers/staging/vt6655/device_cfg.h')
-rw-r--r--drivers/staging/vt6655/device_cfg.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h
index 145457ba768d..c567db0f6f0d 100644
--- a/drivers/staging/vt6655/device_cfg.h
+++ b/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)