staging: wilc1000: align defines

Align some defines in linux_wlan_common.h

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2015-06-17 11:08:09 +09:00 committed by Greg Kroah-Hartman
parent c3ea8a7200
commit 3f4d1c09ae

View file

@ -22,25 +22,21 @@ enum debug_region {
COMP = 0xFFFFFFFF, COMP = 0xFFFFFFFF,
}; };
#define GENERIC_DBG (1 << Generic_debug) #define GENERIC_DBG (1 << Generic_debug)
#define HOSTAPD_DBG (1 << Hostapd_debug) #define HOSTAPD_DBG (1 << Hostapd_debug)
#define HOSTINF_DBG (1 << Hostinf_debug) #define HOSTINF_DBG (1 << Hostinf_debug)
#define CORECONFIG_DBG (1 << Coreconfig_debug) #define CORECONFIG_DBG (1 << Coreconfig_debug)
#define CFG80211_DBG (1 << CFG80211_debug) #define CFG80211_DBG (1 << CFG80211_debug)
#define INT_DBG (1 << Interrupt_debug) #define INT_DBG (1 << Interrupt_debug)
#define TX_DBG (1 << TX_debug) #define TX_DBG (1 << TX_debug)
#define RX_DBG (1 << RX_debug) #define RX_DBG (1 << RX_debug)
#define LOCK_DBG (1 << Lock_debug) #define LOCK_DBG (1 << Lock_debug)
#define TCP_ENH (1 << Tcp_enhance) #define TCP_ENH (1 << Tcp_enhance)
#define SPIN_DEBUG (1 << Spin_debug)
#define INIT_DBG (1 << Init_debug)
/*Added by Amr - BugID_4720*/ #define BUS_DBG (1 << Bus_debug)
#define SPIN_DEBUG (1 << Spin_debug) #define MEM_DBG (1 << Mem_debug)
#define FIRM_DBG (1 << Firmware_debug)
#define INIT_DBG (1 << Init_debug)
#define BUS_DBG (1 << Bus_debug)
#define MEM_DBG (1 << Mem_debug)
#define FIRM_DBG (1 << Firmware_debug)
#if defined (WILC_DEBUGFS) #if defined (WILC_DEBUGFS)
extern int wilc_debugfs_init(void); extern int wilc_debugfs_init(void);
@ -49,38 +45,45 @@ extern void wilc_debugfs_remove(void);
extern atomic_t REGION; extern atomic_t REGION;
extern atomic_t DEBUG_LEVEL; extern atomic_t DEBUG_LEVEL;
#define DEBUG (1 << 0) #define DEBUG (1 << 0)
#define INFO (1 << 1) #define INFO (1 << 1)
#define WRN (1 << 2) #define WRN (1 << 2)
#define ERR (1 << 3) #define ERR (1 << 3)
#define PRINT_D(region, ...) do { \ #define PRINT_D(region, ...) \
if ((atomic_read(&DEBUG_LEVEL) & DEBUG) && ((atomic_read(&REGION)) & (region))) { \ do { \
if ((atomic_read(&DEBUG_LEVEL) & DEBUG) && \
((atomic_read(&REGION)) & (region))) { \
printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \ printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \
printk(__VA_ARGS__); \ printk(__VA_ARGS__); \
} \ } \
} while (0) } while (0)
#define PRINT_INFO(region, ...) do { \ #define PRINT_INFO(region, ...) \
if ((atomic_read(&DEBUG_LEVEL) & INFO) && ((atomic_read(&REGION)) & (region))) { \ do { \
printk("INFO [%s]", __FUNCTION__); \ if ((atomic_read(&DEBUG_LEVEL) & INFO) && \
printk(__VA_ARGS__); \ ((atomic_read(&REGION)) & (region))) { \
} \ printk("INFO [%s]", __FUNCTION__); \
} while (0) printk(__VA_ARGS__); \
} \
} while (0)
#define PRINT_WRN(region, ...) do { \ #define PRINT_WRN(region, ...) \
if ((atomic_read(&DEBUG_LEVEL) & WRN) && ((atomic_read(&REGION)) & (region))) { \ do { \
if ((atomic_read(&DEBUG_LEVEL) & WRN) && \
((atomic_read(&REGION)) & (region))) { \
printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \ printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \
printk(__VA_ARGS__); \ printk(__VA_ARGS__); \
} \ } \
} while (0) } while (0)
#define PRINT_ER(...) do { \ #define PRINT_ER(...) \
if ((atomic_read(&DEBUG_LEVEL) & ERR)) { \ do { \
if ((atomic_read(&DEBUG_LEVEL) & ERR)) { \
printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \ printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \
printk(__VA_ARGS__); \ printk(__VA_ARGS__); \
} \ } \
} while (0) } while (0)
#else #else
@ -89,27 +92,36 @@ extern atomic_t DEBUG_LEVEL;
#define DEBUG 1 #define DEBUG 1
#define INFO 0 #define INFO 0
#define WRN 0 #define WRN 0
#define PRINT_D(region, ...) do { if (DEBUG == 1 && ((REGION)&(region))) { \
printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \
printk(__VA_ARGS__); \
} \
} while (0)
#define PRINT_INFO(region, ...) do { if (INFO == 1 && ((REGION)&(region))) { \ #define PRINT_D(region, ...) \
printk("INFO [%s]", __FUNCTION__); \ do { \
printk(__VA_ARGS__); \ if (DEBUG == 1 && ((REGION)&(region))) { \
} \ printk("DBG [%s: %d]", __FUNCTION__, __LINE__); \
} while (0) printk(__VA_ARGS__); \
} \
} while (0)
#define PRINT_WRN(region, ...) do { if (WRN == 1 && ((REGION)&(region))) { \ #define PRINT_INFO(region, ...) \
printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \ do { \
printk(__VA_ARGS__); \ if (INFO == 1 && ((REGION)&(region))) { \
} \ printk("INFO [%s]", __FUNCTION__); \
} while (0) printk(__VA_ARGS__); \
} \
} while (0)
#define PRINT_ER(...) do { printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \ #define PRINT_WRN(region, ...) \
printk(__VA_ARGS__); \ do { \
} while (0) if (WRN == 1 && ((REGION)&(region))) { \
printk("WRN [%s: %d]", __FUNCTION__, __LINE__); \
printk(__VA_ARGS__); \
} \
} while (0)
#define PRINT_ER(...) \
do { \
printk("ERR [%s: %d]", __FUNCTION__, __LINE__); \
printk(__VA_ARGS__); \
} while (0)
#endif #endif
#define FN_IN /* PRINT_D(">>> \n") */ #define FN_IN /* PRINT_D(">>> \n") */