Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

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

diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h
index 145457ba768d15db53894dba6e288ec3a5560a9b..1137adede9ee2da9fd16cadb14734e416df82122 100644 (file)
--- a/drivers/staging/vt6655/device_cfg.h
+++ b/drivers/staging/vt6655/device_cfg.h
@@ -70,31 +70,26 @@ struct _version {
 //Max: 2378=2312Payload + 30HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR
 #define PKT_BUF_SZ          2390
 
-
 #define MAX_UINTS           8
 #define OPTION_DEFAULT      { [0 ... MAX_UINTS-1] = -1}
 
-
-
 typedef enum  _chip_type {
        VT3253 = 1
 } CHIP_TYPE, *PCHIP_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)
 #define DBG_PORT80(value)
 #endif
 
-
 #endif