diff options
author | Xenia Ragiadakou <burzalodowa@gmail.com> | 2013-06-09 14:38:43 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-11 17:18:04 -0700 |
commit | 4a8d1135548bafe2566ceaa5032981ce6999a86c (patch) | |
tree | 9c0dbadfc0f6a1357f11e0d593fdce3609c8df8a /drivers/staging/rtl8192u | |
parent | 631edcdc459eaa72117303b20a392d0413e7c56a (diff) | |
download | op-kernel-dev-4a8d1135548bafe2566ceaa5032981ce6999a86c.zip op-kernel-dev-4a8d1135548bafe2566ceaa5032981ce6999a86c.tar.gz |
staging: rtl8192u: fix macros in r8192U.h
This patch fixes the macros in r8192U.h.
More specifically:
1) removes the ';' from the end of the macro definition
and changes according the files that are affected by
this change by adding ';' at the end of the macro call
2) replaces printk with pr_debug, when applicable
3) replaces __FUNCTION__ with __func__
4) fixes the framing when the macro contains complex expressions
5) renames macro 'assert' as 'RTL9192U_ASSERT', so that it
cannot be confused with the c function assert(), and changes
accordingly the files affected by this change
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u')
-rw-r--r-- | drivers/staging/rtl8192u/r8192U.h | 46 | ||||
-rw-r--r-- | drivers/staging/rtl8192u/r8192U_core.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8192u/r819xU_phy.c | 2 |
3 files changed, 27 insertions, 23 deletions
diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index 692ceaf..338e7bc 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h @@ -85,10 +85,10 @@ #define DMESGE(x, a...) extern u32 rt_global_debug_component; #define RT_TRACE(component, x, args...) \ -do { if (rt_global_debug_component & component) \ - printk(KERN_DEBUG RTL819xU_MODULE_NAME ":" x "\n" , \ - ##args);\ -} while (0); + do { \ + if (rt_global_debug_component & component) \ + pr_debug("RTL8192U: " x "\n", ##args); \ + } while (0) #define COMP_TRACE BIT0 /* Function call tracing. */ #define COMP_DBG BIT1 @@ -131,30 +131,34 @@ do { if (rt_global_debug_component & component) \ #define RTL819x_DEBUG #ifdef RTL819x_DEBUG -#define assert(expr) \ - if (!(expr)) { \ - printk("Assertion failed! %s,%s,%s,line=%d\n", \ - #expr, __FILE__, __FUNCTION__, __LINE__); \ - } +#define RTL8192U_ASSERT(expr) \ + do { \ + if (!(expr)) { \ + pr_debug("Assertion failed! %s, %s, %s, line = %d\n", \ + #expr, __FILE__, __func__, __LINE__); \ + } \ + } while (0) /* * Debug out data buf. * If you want to print DATA buffer related BA, * please set ieee80211_debug_level to DATA|BA */ -#define RT_DEBUG_DATA(level, data, datalen) \ - do { if ((rt_global_debug_component & (level)) == (level)) { \ - int i; \ - u8 *pdata = (u8 *) data; \ - printk(KERN_DEBUG RTL819xU_MODULE_NAME ": %s()\n", __FUNCTION__); \ - for (i = 0; i < (int)(datalen); i++) { \ +#define RT_DEBUG_DATA(level, data, datalen) \ + do { \ + if ((rt_global_debug_component & (level)) == (level)) { \ + int i; \ + u8 *pdata = (u8 *) data; \ + pr_debug("RTL8192U: %s()\n", __func__); \ + for (i = 0; i < (int)(datalen); i++) { \ printk("%2x ", pdata[i]); \ - if ((i+1)%16 == 0) printk("\n"); \ - } \ - printk("\n"); \ - } \ + if ((i+1)%16 == 0) \ + printk("\n"); \ + } \ + printk("\n"); \ + } \ } while (0) #else -#define assert(expr) do {} while (0) +#define RTL8192U_ASSERT(expr) do {} while (0) #define RT_DEBUG_DATA(level, data, datalen) do {} while (0) #endif /* RTL8169_DEBUG */ @@ -539,7 +543,7 @@ typedef enum _WIRELESS_MODE { } WIRELESS_MODE; -#define RTL_IOCTL_WPA_SUPPLICANT SIOCIWFIRSTPRIV+30 +#define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV + 30) typedef struct buffer { struct buffer *next; diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index c833f18..c880adc 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -1034,7 +1034,7 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat u8 queue_index = tcb_desc->queue_index; /* shall not be referred by command packet */ - assert(queue_index != TXCMD_QUEUE); + RTL8192U_ASSERT(queue_index != TXCMD_QUEUE); spin_lock_irqsave(&priv->tx_lock, flags); diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 60cba80..d66d88c 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c @@ -1519,7 +1519,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) u8 regBwOpMode; RT_TRACE(COMP_SWBW, "==>rtl8192_SetBWModeWorkItem() Switch to %s bandwidth\n", \ - priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz") + priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz"); if(priv->rf_chip == RF_PSEUDO_11N) |