rtlwifi: btcoexist: Convert halbtcoutsrc.c to use standard debugging

The routines in btcoexist use different debugging routines than are used
in the other drivers. This patch converts halbtcoutsrc.c to use the
standard routines. It also deletes the definitions of the now-unused
debugging macros, and turns on compilation of all the routines in
btcoexist.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile b/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
index 0ef0d310fc24e25635f124fed4ca1ffe52814dd2..20582df0465cf7689e54b12a3aa50018a8071d01 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
@@ -1,5 +1,8 @@
-btcoexist-objs :=      halbtc8723b2ant.o       \
-                       halbtc8192e2ant.o       \
+btcoexist-objs :=      halbtc8192e2ant.o       \
+                       halbtc8723b1ant.o       \
+                       halbtc8723b2ant.o       \
+                       halbtc8821a1ant.o       \
+                       halbtc8821a2ant.o       \
                        halbtcoutsrc.o          \
                        rtl_btc.o
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index 9a89ae0df39b041741b372a57623b7287b4c50c3..150aeb8e79d1a4870abbc6e6f8174e3ae7fb6990 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -141,8 +141,8 @@ static u8 halbtc_get_wifi_central_chnl(struct btc_coexist *btcoexist)
 
        if (rtlphy->current_channel != 0)
                chnl = rtlphy->current_channel;
-       btc_alg_dbg(ALGO_TRACE,
-                   "static halbtc_get_wifi_central_chnl:%d\n", chnl);
+       RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
+                "static halbtc_get_wifi_central_chnl:%d\n", chnl);
        return chnl;
 }
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
index f9e7c5e77f515036b4c46a791db5ada05ab91f57..601bbe1d22b35ff911064c3db5638108eca91f94 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -116,18 +116,6 @@ extern u32 btc_dbg_type[];
 #define                WIFI_P2P_GO_CONNECTED                   BIT3
 #define                WIFI_P2P_GC_CONNECTED                   BIT4
 
-#define        btc_alg_dbg(dbgflag, fmt, ...)                                  \
-do {                                                                   \
-       if (unlikely(btc_dbg_type[BTC_MSG_ALGORITHM] & dbgflag))        \
-               printk(KERN_DEBUG fmt, ##__VA_ARGS__);                  \
-} while (0)
-#define        btc_iface_dbg(dbgflag, fmt, ...)                                \
-do {                                                                   \
-       if (unlikely(btc_dbg_type[BTC_MSG_INTERFACE] & dbgflag))        \
-               printk(KERN_DEBUG fmt, ##__VA_ARGS__);                  \
-} while (0)
-
-
 #define        BTC_RSSI_HIGH(_rssi_)   \
        ((_rssi_ == BTC_RSSI_STATE_HIGH ||      \
          _rssi_ == BTC_RSSI_STATE_STAY_HIGH) ? true : false)