rtlwifi: Convert RT_TRACE to rtl_dbg and neatening
cover rtlwifi: Convert RT_TRACE to rtl_dbg and neatening
RT_TRACE seems like it should be associated to tracing but it's not. It's a generic debug logging mechanism.
Rename it to a more typical name.
Miscellaneous neatening around these changes.
Joe Perches (6):
rtlwifi: Convert RT_TRACE to rtl_dbg
rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
rtlwifi: Better spacing around rtl_dbg uses
rtlwifi: Convert rtl_dbg embedded function names to %s: ..., __func__
rtlwifi: Avoid multiline dereferences in rtl_dbg uses
rtlwifi: Convert sleeped to slept in rtl_dbg uses
drivers/net/wireless/realtek/rtlwifi/base.c | 144 +-- .../rtlwifi/btcoexist/halbtc8192e2ant.c | 733 ++++++++-------- .../rtlwifi/btcoexist/halbtc8723b1ant.c | 366 ++++---- .../rtlwifi/btcoexist/halbtc8723b2ant.c | 720 +++++++-------- .../rtlwifi/btcoexist/halbtc8821a1ant.c | 670 +++++++------- .../rtlwifi/btcoexist/halbtc8821a2ant.c | 760 ++++++++-------- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 36 +- .../realtek/rtlwifi/btcoexist/rtl_btc.c | 6 +- drivers/net/wireless/realtek/rtlwifi/cam.c | 82 +- drivers/net/wireless/realtek/rtlwifi/core.c | 261 +++--- drivers/net/wireless/realtek/rtlwifi/debug.c | 4 +- drivers/net/wireless/realtek/rtlwifi/debug.h | 11 +- drivers/net/wireless/realtek/rtlwifi/efuse.c | 72 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 290 +++--- drivers/net/wireless/realtek/rtlwifi/ps.c | 98 +-- drivers/net/wireless/realtek/rtlwifi/regd.c | 18 +- .../wireless/realtek/rtlwifi/rtl8188ee/dm.c | 201 +++-- .../wireless/realtek/rtlwifi/rtl8188ee/fw.c | 90 +- .../wireless/realtek/rtlwifi/rtl8188ee/hw.c | 194 ++--- .../wireless/realtek/rtlwifi/rtl8188ee/led.c | 20 +- .../wireless/realtek/rtlwifi/rtl8188ee/phy.c | 385 ++++---- .../wireless/realtek/rtlwifi/rtl8188ee/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8188ee/trx.c | 24 +- .../realtek/rtlwifi/rtl8192c/dm_common.c | 225 +++-- .../realtek/rtlwifi/rtl8192c/fw_common.c | 88 +- .../realtek/rtlwifi/rtl8192c/phy_common.c | 268 +++--- .../wireless/realtek/rtlwifi/rtl8192ce/dm.c | 40 +- .../wireless/realtek/rtlwifi/rtl8192ce/hw.c | 178 ++-- .../wireless/realtek/rtlwifi/rtl8192ce/led.c | 12 +- .../wireless/realtek/rtlwifi/rtl8192ce/phy.c | 121 ++- .../wireless/realtek/rtlwifi/rtl8192ce/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 14 +- .../wireless/realtek/rtlwifi/rtl8192cu/dm.c | 40 +- .../wireless/realtek/rtlwifi/rtl8192cu/hw.c | 154 ++-- .../wireless/realtek/rtlwifi/rtl8192cu/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 66 +- .../wireless/realtek/rtlwifi/rtl8192cu/phy.c | 134 +-- .../wireless/realtek/rtlwifi/rtl8192cu/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8192cu/trx.c | 58 +- .../wireless/realtek/rtlwifi/rtl8192de/dm.c | 314 +++---- .../wireless/realtek/rtlwifi/rtl8192de/fw.c | 116 +-- .../wireless/realtek/rtlwifi/rtl8192de/hw.c | 206 ++--- .../wireless/realtek/rtlwifi/rtl8192de/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8192de/phy.c | 422 ++++----- .../wireless/realtek/rtlwifi/rtl8192de/rf.c | 30 +- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 20 +- .../wireless/realtek/rtlwifi/rtl8192ee/dm.c | 66 +- .../wireless/realtek/rtlwifi/rtl8192ee/fw.c | 102 +-- .../wireless/realtek/rtlwifi/rtl8192ee/hw.c | 208 ++--- .../wireless/realtek/rtlwifi/rtl8192ee/led.c | 18 +- .../wireless/realtek/rtlwifi/rtl8192ee/phy.c | 357 ++++---- .../wireless/realtek/rtlwifi/rtl8192ee/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8192ee/trx.c | 32 +- .../wireless/realtek/rtlwifi/rtl8192se/dm.c | 42 +- .../wireless/realtek/rtlwifi/rtl8192se/fw.c | 40 +- .../wireless/realtek/rtlwifi/rtl8192se/hw.c | 158 ++-- .../wireless/realtek/rtlwifi/rtl8192se/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8192se/phy.c | 215 +++-- .../wireless/realtek/rtlwifi/rtl8192se/rf.c | 70 +- .../wireless/realtek/rtlwifi/rtl8192se/sw.c | 4 +- .../wireless/realtek/rtlwifi/rtl8192se/trx.c | 10 +- .../wireless/realtek/rtlwifi/rtl8723ae/dm.c | 162 ++-- .../wireless/realtek/rtlwifi/rtl8723ae/fw.c | 64 +- .../rtlwifi/rtl8723ae/hal_bt_coexist.c | 151 ++-- .../realtek/rtlwifi/rtl8723ae/hal_btc.c | 654 +++++++------- .../wireless/realtek/rtlwifi/rtl8723ae/hw.c | 234 ++--- .../wireless/realtek/rtlwifi/rtl8723ae/led.c | 12 +- .../wireless/realtek/rtlwifi/rtl8723ae/phy.c | 344 ++++---- .../wireless/realtek/rtlwifi/rtl8723ae/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8723ae/trx.c | 14 +- .../wireless/realtek/rtlwifi/rtl8723be/dm.c | 119 ++- .../wireless/realtek/rtlwifi/rtl8723be/fw.c | 66 +- .../wireless/realtek/rtlwifi/rtl8723be/hw.c | 202 ++--- .../wireless/realtek/rtlwifi/rtl8723be/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8723be/phy.c | 309 ++++--- .../wireless/realtek/rtlwifi/rtl8723be/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8723be/trx.c | 24 +- .../realtek/rtlwifi/rtl8723com/fw_common.c | 22 +- .../realtek/rtlwifi/rtl8723com/phy_common.c | 36 +- .../wireless/realtek/rtlwifi/rtl8821ae/dm.c | 823 +++++++++--------- .../wireless/realtek/rtlwifi/rtl8821ae/fw.c | 134 +-- .../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 466 +++++----- .../wireless/realtek/rtlwifi/rtl8821ae/led.c | 32 +- .../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 538 ++++++------ .../wireless/realtek/rtlwifi/rtl8821ae/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8821ae/trx.c | 58 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 18 +- 87 files changed, 6766 insertions(+), 6811 deletions(-)
Signature · 1 line
2.26.0
PATCH 1/6 rtlwifi: Convert RT_TRACE to rtl_dbg
These uses are possibly confused with tracing but are actually debugging logging uses.
Make the RT_TRACE uses more like the normal kernel debug styles.
Miscellanea:
o Realign multiline statements to open parenthesis
o Use single line macro define for rtl_dbg
--- drivers/net/wireless/realtek/rtlwifi/base.c | 144 +-- .../rtlwifi/btcoexist/halbtc8192e2ant.c | 732 ++++++++-------- .../rtlwifi/btcoexist/halbtc8723b1ant.c | 366 ++++---- .../rtlwifi/btcoexist/halbtc8723b2ant.c | 720 +++++++-------- .../rtlwifi/btcoexist/halbtc8821a1ant.c | 670 +++++++------- .../rtlwifi/btcoexist/halbtc8821a2ant.c | 760 ++++++++-------- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 28 +- .../realtek/rtlwifi/btcoexist/rtl_btc.c | 6 +- drivers/net/wireless/realtek/rtlwifi/cam.c | 84 +- drivers/net/wireless/realtek/rtlwifi/core.c | 260 +++--- drivers/net/wireless/realtek/rtlwifi/debug.c | 4 +- drivers/net/wireless/realtek/rtlwifi/debug.h | 11 +- drivers/net/wireless/realtek/rtlwifi/efuse.c | 72 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 290 +++--- drivers/net/wireless/realtek/rtlwifi/ps.c | 98 +-- drivers/net/wireless/realtek/rtlwifi/regd.c | 18 +- .../wireless/realtek/rtlwifi/rtl8188ee/dm.c | 202 ++--- .../wireless/realtek/rtlwifi/rtl8188ee/fw.c | 90 +- .../wireless/realtek/rtlwifi/rtl8188ee/hw.c | 194 ++-- .../wireless/realtek/rtlwifi/rtl8188ee/led.c | 20 +- .../wireless/realtek/rtlwifi/rtl8188ee/phy.c | 386 ++++---- .../wireless/realtek/rtlwifi/rtl8188ee/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8188ee/trx.c | 24 +- .../realtek/rtlwifi/rtl8192c/dm_common.c | 226 ++--- .../realtek/rtlwifi/rtl8192c/fw_common.c | 88 +- .../realtek/rtlwifi/rtl8192c/phy_common.c | 284 +++--- .../wireless/realtek/rtlwifi/rtl8192ce/dm.c | 40 +- .../wireless/realtek/rtlwifi/rtl8192ce/hw.c | 178 ++-- .../wireless/realtek/rtlwifi/rtl8192ce/led.c | 12 +- .../wireless/realtek/rtlwifi/rtl8192ce/phy.c | 122 +-- .../wireless/realtek/rtlwifi/rtl8192ce/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 14 +- .../wireless/realtek/rtlwifi/rtl8192cu/dm.c | 40 +- .../wireless/realtek/rtlwifi/rtl8192cu/hw.c | 154 ++-- .../wireless/realtek/rtlwifi/rtl8192cu/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 66 +- .../wireless/realtek/rtlwifi/rtl8192cu/phy.c | 134 +-- .../wireless/realtek/rtlwifi/rtl8192cu/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8192cu/trx.c | 58 +- .../wireless/realtek/rtlwifi/rtl8192de/dm.c | 314 +++---- .../wireless/realtek/rtlwifi/rtl8192de/fw.c | 116 +-- .../wireless/realtek/rtlwifi/rtl8192de/hw.c | 206 ++--- .../wireless/realtek/rtlwifi/rtl8192de/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8192de/phy.c | 422 ++++----- .../wireless/realtek/rtlwifi/rtl8192de/rf.c | 30 +- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 20 +- .../wireless/realtek/rtlwifi/rtl8192ee/dm.c | 66 +- .../wireless/realtek/rtlwifi/rtl8192ee/fw.c | 102 +-- .../wireless/realtek/rtlwifi/rtl8192ee/hw.c | 208 ++--- .../wireless/realtek/rtlwifi/rtl8192ee/led.c | 18 +- .../wireless/realtek/rtlwifi/rtl8192ee/phy.c | 358 ++++---- .../wireless/realtek/rtlwifi/rtl8192ee/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8192ee/trx.c | 32 +- .../wireless/realtek/rtlwifi/rtl8192se/dm.c | 42 +- .../wireless/realtek/rtlwifi/rtl8192se/fw.c | 40 +- .../wireless/realtek/rtlwifi/rtl8192se/hw.c | 158 ++-- .../wireless/realtek/rtlwifi/rtl8192se/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8192se/phy.c | 216 ++--- .../wireless/realtek/rtlwifi/rtl8192se/rf.c | 70 +- .../wireless/realtek/rtlwifi/rtl8192se/sw.c | 4 +- .../wireless/realtek/rtlwifi/rtl8192se/trx.c | 10 +- .../wireless/realtek/rtlwifi/rtl8723ae/dm.c | 162 ++-- .../wireless/realtek/rtlwifi/rtl8723ae/fw.c | 64 +- .../rtlwifi/rtl8723ae/hal_bt_coexist.c | 150 ++-- .../realtek/rtlwifi/rtl8723ae/hal_btc.c | 652 +++++++------- .../wireless/realtek/rtlwifi/rtl8723ae/hw.c | 234 ++--- .../wireless/realtek/rtlwifi/rtl8723ae/led.c | 12 +- .../wireless/realtek/rtlwifi/rtl8723ae/phy.c | 360 ++++---- .../wireless/realtek/rtlwifi/rtl8723ae/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8723ae/trx.c | 14 +- .../wireless/realtek/rtlwifi/rtl8723be/dm.c | 120 +-- .../wireless/realtek/rtlwifi/rtl8723be/fw.c | 66 +- .../wireless/realtek/rtlwifi/rtl8723be/hw.c | 202 ++--- .../wireless/realtek/rtlwifi/rtl8723be/led.c | 10 +- .../wireless/realtek/rtlwifi/rtl8723be/phy.c | 310 +++---- .../wireless/realtek/rtlwifi/rtl8723be/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8723be/trx.c | 24 +- .../realtek/rtlwifi/rtl8723com/fw_common.c | 22 +- .../realtek/rtlwifi/rtl8723com/phy_common.c | 36 +- .../wireless/realtek/rtlwifi/rtl8821ae/dm.c | 826 +++++++++--------- .../wireless/realtek/rtlwifi/rtl8821ae/fw.c | 134 +-- .../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 466 +++++----- .../wireless/realtek/rtlwifi/rtl8821ae/led.c | 32 +- .../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 530 +++++------ .../wireless/realtek/rtlwifi/rtl8821ae/rf.c | 6 +- .../wireless/realtek/rtlwifi/rtl8821ae/trx.c | 56 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 18 +- 87 files changed, 6799 insertions(+), 6800 deletions(-)
drivers/net/wireless/realtek/rtlwifi/base.c +72 -72
@@ -195,8 +195,8 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, }else {if (get_rf_type (rtlphy) ==RF_1T2R ||get_rf_type (rtlphy) ==RF_2T2R ) { -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG , -"1T2R or 2T2R\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG , +"1T2R or 2T2R\n" ); ht_cap->mcs.rx_mask[0 ] =0xFF ; ht_cap->mcs.rx_mask[1 ] =0xFF ; ht_cap->mcs.rx_mask[4 ] =0x01 ;
@@ -204,7 +204,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, ht_cap->mcs.rx_highest =cpu_to_le16 (MAX_BIT_RATE_40MHZ_MCS15 ); }else if (get_rf_type (rtlphy) ==RF_1T1R ) { -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG ,"1T1R\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG ,"1T1R\n" ); ht_cap->mcs.rx_mask[0 ] =0xFF ; ht_cap->mcs.rx_mask[1 ] =0x00 ;
@@ -1324,7 +1324,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb) rtlpriv->cfg->ops->chk_switch_dmdp (hw); }if (ieee80211_is_auth (fc)) { -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG ,"MAC80211_LINKING\n" ); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG ,"MAC80211_LINKING\n" ); mac->link_state =MAC80211_LINKING ;/* Dul mac */
@@ -1385,7 +1385,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)if (mac->act_scanning)return false; -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG ,"%s ACT_ADDBAREQ From :%pM\n" , is_tx ?"Tx" :"Rx" , hdr->addr2); RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
@@ -1400,8 +1400,8 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)rcu_read_lock (); sta =rtl_find_sta (hw, hdr->addr3);if (sta ==NULL ) { -RT_TRACE (rtlpriv,COMP_SEND |COMP_RECV , -DBG_DMESG ,"sta is NULL\n" ); +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV , +DBG_DMESG ,"sta is NULL\n" );rcu_read_unlock ();return true; }
@@ -1428,13 +1428,13 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) }break ;case ACT_ADDBARSP : -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"%s ACT_ADDBARSP From :%pM\n" , - is_tx ?"Tx" :"Rx" , hdr->addr2); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"%s ACT_ADDBARSP From :%pM\n" , + is_tx ?"Tx" :"Rx" , hdr->addr2);break ;case ACT_DELBA : -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"ACT_ADDBADEL From :%pM\n" , hdr->addr2); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"ACT_ADDBADEL From :%pM\n" , hdr->addr2);break ; }break ;
@@ -1519,9 +1519,9 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,/* 68 : UDP BOOTP client * 67 : UDP BOOTP server */ -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ), -DBG_DMESG ,"dhcp %s !!\n" , - (is_tx) ?"Tx" :"Rx" ); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ), +DBG_DMESG ,"dhcp %s !!\n" , + (is_tx) ?"Tx" :"Rx" );if (is_tx) setup_special_tx(rtlpriv, ppsc,
@@ -1540,8 +1540,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx, rtlpriv->btcoexist.btc_info.in_4way = true; rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies; -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"802.1X %s EAPOL pkt!!\n" , (is_tx) ?"Tx" :"Rx" ); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"802.1X %s EAPOL pkt!!\n" , (is_tx) ?"Tx" :"Rx" );if (is_tx) { rtlpriv->ra.is_special_data = true;
@@ -1583,12 +1583,12 @@ static void rtl_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, info =IEEE80211_SKB_CB (skb);ieee80211_tx_info_clear_status (info);if (ack) { -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , -"tx report: ack\n" ); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , +"tx report: ack\n" ); info->flags |=IEEE80211_TX_STAT_ACK ; }else { -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , -"tx report: not ack\n" ); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , +"tx report: not ack\n" ); info->flags &= ~IEEE80211_TX_STAT_ACK ; }ieee80211_tx_status_irqsafe (hw, skb);
@@ -1626,8 +1626,8 @@ static u16 rtl_get_tx_report_sn(struct ieee80211_hw *hw, tx_report->last_sent_time = jiffies; tx_info->sn = sn; tx_info->send_time = tx_report->last_sent_time; -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , -"Send TX-Report sn=0x%X\n" , sn); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , +"Send TX-Report sn=0x%X\n" , sn);return sn; }
@@ -1674,9 +1674,9 @@ void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf, u8 c2h_cmd_len)break ; } } -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , -"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n" , - st, sn, retry); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , +"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n" , + st, sn, retry); }EXPORT_SYMBOL_GPL (rtl_tx_report_handler);
@@ -1689,9 +1689,9 @@ bool rtl_check_tx_report_acked(struct ieee80211_hw *hw)return true;if (time_before (tx_report->last_sent_time +3 *HZ , jiffies)) { -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_WARNING , -"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n" , - tx_report->last_sent_sn, tx_report->last_recv_sn); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_WARNING , +"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n" , + tx_report->last_sent_sn, tx_report->last_recv_sn);return true;/* 3 sec. (timeout) seen as acked */ }
@@ -1707,8 +1707,8 @@ void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms)if (rtl_check_tx_report_acked (hw))break ;usleep_range (1000 ,2000 ); -RT_TRACE (rtlpriv,COMP_SEC ,DBG_DMESG , -"Wait 1ms (%d/%d) to disable key.\n" , i, wait_ms); +rtl_dbg (rtlpriv,COMP_SEC ,DBG_DMESG , +"Wait 1ms (%d/%d) to disable key.\n" , i, wait_ms); } }
@@ -1770,9 +1770,9 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return -ENXIO ; tid_data = &sta_entry->tids[tid]; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d seq:%d\n" , sta->addr, tid, - *ssn); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d seq:%d\n" , sta->addr, tid, + *ssn); tid_data->agg.agg_state =RTL_AGG_START ;
@@ -1788,8 +1788,8 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,if (sta ==NULL )return -EINVAL ; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid);if (unlikely (tid >=MAX_TID_COUNT ))return -EINVAL ;
@@ -1828,8 +1828,8 @@ int rtl_rx_agg_start(struct ieee80211_hw *hw,return -ENXIO ; tid_data = &sta_entry->tids[tid]; -RT_TRACE (rtlpriv,COMP_RECV ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_RECV ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid); tid_data->agg.rx_agg_state =RTL_RX_AGG_START ;return 0 ;
@@ -1844,8 +1844,8 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw,if (sta ==NULL )return -EINVAL ; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid);if (unlikely (tid >=MAX_TID_COUNT ))return -EINVAL ;
@@ -1865,8 +1865,8 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,if (sta ==NULL )return -EINVAL ; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid);if (unlikely (tid >=MAX_TID_COUNT ))return -EINVAL ;
@@ -1886,9 +1886,9 @@ void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv) btc_ops->btc_get_ampdu_cfg (rtlpriv, &reject_agg, &ctrl_agg_size, &agg_size); -RT_TRACE (rtlpriv,COMP_BT_COEXIST ,DBG_DMESG , -"Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d" , - reject_agg, ctrl_agg_size, agg_size); +rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_DMESG , +"Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d" , + reject_agg, ctrl_agg_size, agg_size); rtlpriv->hw->max_rx_aggregation_subframes = (ctrl_agg_size ? agg_size :IEEE80211_MAX_AMPDU_BUF_HT );
@@ -1976,9 +1976,9 @@ void rtl_scan_list_expire(struct ieee80211_hw *hw)list_del (&entry->list); rtlpriv->scan_list.num--; -RT_TRACE (rtlpriv,COMP_SCAN ,DBG_LOUD , -"BSSID=%pM is expire in scan list (total=%d)\n" , - entry->bssid, rtlpriv->scan_list.num); +rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD , +"BSSID=%pM is expire in scan list (total=%d)\n" , + entry->bssid, rtlpriv->scan_list.num);kfree (entry); }
@@ -2012,9 +2012,9 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)if (memcmp (entry->bssid, hdr->addr3,ETH_ALEN ) ==0 ) {list_del_init (&entry->list); entry_found = true; -RT_TRACE (rtlpriv,COMP_SCAN ,DBG_LOUD , -"Update BSSID=%pM to scan list (total=%d)\n" , - hdr->addr3, rtlpriv->scan_list.num); +rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD , +"Update BSSID=%pM to scan list (total=%d)\n" , + hdr->addr3, rtlpriv->scan_list.num);break ; } }
@@ -2028,9 +2028,9 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)memcpy (entry->bssid, hdr->addr3,ETH_ALEN ); rtlpriv->scan_list.num++; -RT_TRACE (rtlpriv,COMP_SCAN ,DBG_LOUD , -"Add BSSID=%pM to scan list (total=%d)\n" , - hdr->addr3, rtlpriv->scan_list.num); +rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD , +"Add BSSID=%pM to scan list (total=%d)\n" , + hdr->addr3, rtlpriv->scan_list.num); } entry->age = jiffies;
@@ -2190,8 +2190,8 @@ void rtl_watchdog_wq_callback(void *data)if ((rtlpriv->link_info.bcn_rx_inperiod + rtlpriv->link_info.num_rx_inperiod) ==0 ) { rtlpriv->link_info.roam_times++; -RT_TRACE (rtlpriv,COMP_ERR ,DBG_DMESG , -"AP off for %d s\n" , +rtl_dbg (rtlpriv,COMP_ERR ,DBG_DMESG , +"AP off for %d s\n" , (rtlpriv->link_info.roam_times *2 ));/* if we can't recv beacon for 10s,
@@ -2304,11 +2304,11 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw,switch (cmd_id) {case C2H_DBG : -RT_TRACE (rtlpriv,COMP_FW ,DBG_LOUD ,"[C2H], C2H_DBG!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"[C2H], C2H_DBG!!\n" );break ;case C2H_TXBF : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], C2H_TXBF!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], C2H_TXBF!!\n" );break ;case C2H_TX_REPORT :rtl_tx_report_handler (hw, cmd_buf, cmd_len);
@@ -2318,20 +2318,20 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw, hal_ops->c2h_ra_report_handler (hw, cmd_buf, cmd_len);break ;case C2H_BT_INFO : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], C2H_BT_INFO!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], C2H_BT_INFO!!\n" );if (rtlpriv->cfg->ops->get_btc_status ()) btc_ops->btc_btinfo_notify (rtlpriv, cmd_buf, cmd_len);break ;case C2H_BT_MP : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], C2H_BT_MP!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], C2H_BT_MP!!\n" );if (rtlpriv->cfg->ops->get_btc_status ()) btc_ops->btc_btmpinfo_notify (rtlpriv, cmd_buf, cmd_len);break ;default : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], Unknown packet!! cmd_id(%#X)!\n" , cmd_id); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], Unknown packet!! cmd_id(%#X)!\n" , cmd_id);break ; } }
@@ -2355,8 +2355,8 @@ void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec)if (!skb)break ; -RT_TRACE (rtlpriv,COMP_FW ,DBG_DMESG ,"C2H rx_desc_shift=%d\n" , - *((u8 *)skb->cb)); +rtl_dbg (rtlpriv,COMP_FW ,DBG_DMESG ,"C2H rx_desc_shift=%d\n" , + *((u8 *)skb->cb));RT_PRINT_DATA (rtlpriv,COMP_FW ,DBG_DMESG ,"C2H data: " , skb->data, skb->len);
@@ -2701,29 +2701,29 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) (memcmp(mac->bssid, ap5_6, 3) == 0) || vendor == PEER_ATH) { vendor =PEER_ATH ; -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ath find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ath find\n" ); } else if ((memcmp(mac->bssid, ap4_4, 3) == 0) || (memcmp(mac->bssid, ap4_5, 3) == 0) || (memcmp(mac->bssid, ap4_1, 3) == 0) || (memcmp(mac->bssid, ap4_2, 3) == 0) || (memcmp(mac->bssid, ap4_3, 3) == 0) || vendor == PEER_RAL) { -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ral find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ral find\n" ); vendor =PEER_RAL ; } else if (memcmp(mac->bssid, ap6_1, 3) == 0 || vendor == PEER_CISCO) { vendor =PEER_CISCO ; -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>cisco find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>cisco find\n" ); } else if ((memcmp(mac->bssid, ap3_1, 3) == 0) || (memcmp(mac->bssid, ap3_2, 3) == 0) || (memcmp(mac->bssid, ap3_3, 3) == 0) || vendor == PEER_BROAD) { -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>broad find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>broad find\n" ); vendor =PEER_BROAD ; } else if (memcmp(mac->bssid, ap7_1, 3) == 0 || vendor == PEER_MARV) { vendor =PEER_MARV ; -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>marv find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>marv find\n" ); } mac->vendor = vendor;
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c +366 -366
1,302 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c +183 -183
748 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +360 -360
612 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c +335 -335
670 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c +380 -380
760 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +14 -14
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/cam.c +42 -42
84 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/core.c +130 -130
260 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/debug.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/debug.h +5 -6
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/efuse.c +36 -36
72 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/pci.c +145 -145
290 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/ps.c +49 -49
98 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/regd.c +9 -9
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c +101 -101
202 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c +45 -45
90 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +97 -97
194 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c +10 -10
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c +193 -193
386 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c +12 -12
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c +113 -113
226 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +44 -44
88 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +142 -142
284 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c +20 -20
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c +89 -89
178 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +61 -61
122 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c +20 -20
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c +77 -77
154 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c +33 -33
66 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c +67 -67
134 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c +29 -29
58 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c +157 -157
314 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c +58 -58
116 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c +103 -103
206 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +211 -211
422 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c +15 -15
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +10 -10
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c +33 -33
66 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c +51 -51
102 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c +104 -104
208 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c +9 -9
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c +179 -179
358 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c +16 -16
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c +21 -21
42 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c +20 -20
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c +79 -79
158 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c +108 -108
216 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c +35 -35
70 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c +81 -81
162 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c +32 -32
64 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c +75 -75
150 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c +326 -326
652 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c +117 -117
234 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c +180 -180
360 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c +60 -60
120 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c +33 -33
66 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +101 -101
202 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c +155 -155
310 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c +12 -12
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c +11 -11
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c +18 -18
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c +413 -413
826 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c +67 -67
134 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +233 -233
466 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c +16 -16
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +265 -265
530 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c +28 -28
56 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/usb.c +9 -9
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.0
Part of the diff is not shown here. View the raw message.
PATCH 2/6 rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
In reply to Joe PerchesMake these statements a little simpler.
--- drivers/net/wireless/realtek/rtlwifi/base.c | 14 +++++------ .../rtlwifi/btcoexist/halbtc8192e2ant.c | 23 ++++++++++--------- .../rtlwifi/btcoexist/halbtc8821a2ant.c | 12 +++++----- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 9 ++++---- drivers/net/wireless/realtek/rtlwifi/pci.c | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-)
drivers/net/wireless/realtek/rtlwifi/base.c +7 -7
@@ -1385,7 +1385,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)if (mac->act_scanning)return false; -rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV ,DBG_DMESG ,"%s ACT_ADDBAREQ From :%pM\n" , is_tx ?"Tx" :"Rx" , hdr->addr2); RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
@@ -1428,12 +1428,12 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) }break ;case ACT_ADDBARSP : -rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV ,DBG_DMESG ,"%s ACT_ADDBARSP From :%pM\n" , is_tx ?"Tx" :"Rx" , hdr->addr2);break ;case ACT_DELBA : -rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV ,DBG_DMESG ,"ACT_ADDBADEL From :%pM\n" , hdr->addr2);break ; }
@@ -1519,9 +1519,9 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,/* 68 : UDP BOOTP client * 67 : UDP BOOTP server */ -rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ), +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV ,DBG_DMESG ,"dhcp %s !!\n" , - (is_tx) ?"Tx" :"Rx" ); + is_tx ?"Tx" :"Rx" );if (is_tx) setup_special_tx(rtlpriv, ppsc,
@@ -1540,8 +1540,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx, rtlpriv->btcoexist.btc_info.in_4way = true; rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies; -rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"802.1X %s EAPOL pkt!!\n" , (is_tx) ?"Tx" :"Rx" ); +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV ,DBG_DMESG , +"802.1X %s EAPOL pkt!!\n" , is_tx ?"Tx" :"Rx" );if (is_tx) { rtlpriv->ra.is_special_data = true;
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c +12 -11
@@ -801,8 +801,8 @@ static void btc8192e2ant_bt_auto_report(struct btc_coexist *btcoexist,rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD ,"[BTCoex], %s BT Auto report = %s\n" , - (force_exec ?"force to" :"" ), - ((enable_auto_report) ?"Enabled" :"Disabled" )); + force_exec ?"force to" :"" , + enable_auto_report ?"Enabled" :"Disabled" ); coex_dm->cur_bt_auto_report = enable_auto_report;if (!force_exec) {
@@ -878,9 +878,9 @@ static void btc8192e2ant_rf_shrink(struct btc_coexist *btcoexist,struct rtl_priv *rtlpriv = btcoexist->adapter;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"[BTCoex], %s turn Rx RF Shrink = %s\n" , - (force_exec ?"force to" :"" ), - ((rx_rf_shrink_on) ?"ON" :"OFF" )); +"[BTCoex], %sturn Rx RF Shrink = %s\n" , + force_exec ?"force to " :"" , + rx_rf_shrink_on ?"ON" :"OFF" ); coex_dm->cur_rf_rx_lpf_shrink = rx_rf_shrink_on;if (!force_exec) {
@@ -927,9 +927,10 @@ static void btc8192e2ant_dac_swing(struct btc_coexist *btcoexist,struct rtl_priv *rtlpriv = btcoexist->adapter;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"[BTCoex], %s turn DacSwing=%s, dac_swing_lvl = 0x%x\n" , - (force_exec ?"force to" :"" ), - ((dac_swing_on) ?"ON" :"OFF" ), dac_swing_lvl); +"[BTCoex], %sturn DacSwing=%s, dac_swing_lvl = 0x%x\n" , + force_exec ?"force to " :"" , + dac_swing_on ?"ON" :"OFF" , + dac_swing_lvl); coex_dm->cur_dac_swing_on = dac_swing_on; coex_dm->cur_dac_swing_lvl = dac_swing_lvl;
@@ -987,9 +988,9 @@ static void btc8192e2ant_agc_table(struct btc_coexist *btcoexist,struct rtl_priv *rtlpriv = btcoexist->adapter;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"[BTCoex], %s %s Agc Table\n" , - (force_exec ?"force to" :"" ), - ((agc_table_en) ?"Enable" :"Disable" )); +"[BTCoex], %s%s Agc Table\n" , + force_exec ?"force to " :"" , + agc_table_en ?"Enable" :"Disable" ); coex_dm->cur_agc_table_en = agc_table_en;if (!force_exec) {
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c +6 -6
@@ -732,9 +732,9 @@ static void btc8821a2ant_low_penalty_ra(struct btc_coexist *btcoexist,struct rtl_priv *rtlpriv = btcoexist->adapter;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"[BTCoex], %s turn LowPenaltyRA = %s\n" , - (force_exec ?"force to" :"" ), - ((low_penalty_ra) ?"ON" :"OFF" )); +"[BTCoex], %sturn LowPenaltyRA = %s\n" , + force_exec ?"force to " :"" , + low_penalty_ra ?"ON" :"OFF" ); coex_dm->cur_low_penalty_ra = low_penalty_ra;if (!force_exec) {
@@ -780,9 +780,9 @@ static void btc8821a2ant_dac_swing(struct btc_coexist *btcoexist,struct rtl_priv *rtlpriv = btcoexist->adapter;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"[BTCoex], %s turn DacSwing = %s, dac_swing_lvl = 0x%x\n" , - (force_exec ?"force to" :"" ), - ((dac_swing_on) ?"ON" :"OFF" ), +"[BTCoex], %sturn DacSwing = %s, dac_swing_lvl = 0x%x\n" , + force_exec ?"force to " :"" , + dac_swing_on ?"ON" :"OFF" , dac_swing_lvl); coex_dm->cur_dac_swing_on = dac_swing_on; coex_dm->cur_dac_swing_lvl = dac_swing_lvl;
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +4 -5
@@ -874,11 +874,10 @@ static void halbtc_display_wifi_status(struct btc_coexist *btcoexist,seq_printf (m,"\n %-35s = %s / %s/ %s/ AP=%d " ,"Wifi freq/ bw/ traffic" , gl_btc_wifi_freq_string[wifi_freq], - ((wifi_under_b_mode) ?"11b" : - gl_btc_wifi_bw_string[wifi_bw]), - ((!wifi_busy) ?"idle" : ((BTC_WIFI_TRAFFIC_TX == - wifi_traffic_dir) ?"uplink" : -"downlink" )), + wifi_under_b_mode ?"11b" : gl_btc_wifi_bw_string[wifi_bw], + (!wifi_busy ?"idle" : + wifi_traffic_dir ==BTC_WIFI_TRAFFIC_TX ?"uplink" : +"downlink" ), ap_num);/* power status */
drivers/net/wireless/realtek/rtlwifi/pci.c +1 -1
@@ -557,7 +557,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)if (rtlpriv->rtlhal.earlymode_enable)skb_pull (skb,EM_HDR_LEN ); - rtl_dbg(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE, + rtl_dbg(rtlpriv, COMP_INTR | COMP_SEND, DBG_TRACE, "new ring->idx:%d, free: skb_queue_len:%d, free: seq:%x\n", ring->idx, skb_queue_len(&ring->queue),
Signature · 1 line
2.26.0
Pkshih
maintainerRe: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 12 lines · Joe Perches
Make these statements a little simpler.
Signed-off-by Joe Perches <[email protected]>---
drivers/net/wireless/realtek/rtlwifi/base.c | 14 +++++------ .../rtlwifi/btcoexist/halbtc8192e2ant.c | 23 ++++++++++--------- .../rtlwifi/btcoexist/halbtc8821a2ant.c | 12 +++++----- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 9 ++++---- drivers/net/wireless/realtek/rtlwifi/pci.c | 2 +-5 files changed, 30 insertions(+), 30 deletions(-)
[...]
Quoted 9 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +0
-0@@ -874,11 +874,10 @@ static void halbtc_display_wifi_status(struct btc_coexist *btcoexist, seq_printf(m, "\n %-35s = %s / %s/ %s/ AP=%d ", "Wifi freq/ bw/ traffic",
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c static void halbtc_display_wifi_status(struct · line 881
Quoted 10 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +4
-5gl_btc_wifi_freq_string[wifi_freq], - ((wifi_under_b_mode) ? "11b" : - gl_btc_wifi_bw_string[wifi_bw]), - ((!wifi_busy) ? "idle" : ((BTC_WIFI_TRAFFIC_TX == - wifi_traffic_dir) ? "uplink" : - "downlink")), + wifi_under_b_mode ? "11b" : gl_btc_wifi_bw_string[wifi_bw], + (!wifi_busy ? "idle" : + wifi_traffic_dir == BTC_WIFI_TRAFFIC_TX ? "uplink" : + "downlink"),
I think this would be better
+ !wifi_busy ? "idle" :
+ (wifi_traffic_dir == BTC_WIFI_TRAFFIC_TX ? "uplink" :
+ "downlink"),
Quoted 19 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +0
-0ap_num);
/* power status */drivers/net/wireless/realtek/rtlwifi/pci.c +0
-0@@ -557,7 +557,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) if (rtlpriv->rtlhal.earlymode_enable) skb_pull(skb, EM_HDR_LEN);drivers/net/wireless/realtek/rtlwifi/pci.c +1
-1- rtl_dbg(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE, + rtl_dbg(rtlpriv, COMP_INTR | COMP_SEND, DBG_TRACE,"new ring->idx:%d, free: skb_queue_len:%d, free:
seq:%x\n",
ring->idx,skb_queue_len(&ring->queue),
Re: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 2 lines · Pkshih
Quoted 1 line · Joe Perches
Make these statements a little simpler.
[]
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
[]
Quoted 17 lines
Quoted 4 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +0
-0@@ -874,11 +874,10 @@ static void halbtc_display_wifi_status(struct btc_coexist *btcoexist, seq_printf(m, "\n %-35s = %s / %s/ %s/ AP=%d ", "Wifi freq/ bw/ traffic",drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c static void halbtc_display_wifi_status(struct · line 881
Quoted 10 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +4
-5gl_btc_wifi_freq_string[wifi_freq], - ((wifi_under_b_mode) ?"11b" : - gl_btc_wifi_bw_string[wifi_bw]), - ((!wifi_busy) ?"idle" : ((BTC_WIFI_TRAFFIC_TX == - wifi_traffic_dir) ?"uplink" : - "downlink")), + wifi_under_b_mode ?"11b" : gl_btc_wifi_bw_string[wifi_bw], + (!wifi_busy ?"idle" : + wifi_traffic_dir ==BTC_WIFI_TRAFFIC_TX ?"uplink" : + "downlink"),I think this would be better
Review
Quoted 3 lines
(quoted diff) +3
-0+ !wifi_busy ? "idle" : + (wifi_traffic_dir == BTC_WIFI_TRAFFIC_TX ? "uplink" : + "downlink"),
It seems most repeated test1 ? : test2 ? : test3 ?:
uses do not have the style you suggest in the kernel.
Pkshih
maintainerRe: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 19 lines · Joe Perches
Quoted 2 lines · Pkshih
Quoted 1 line · Joe Perches
Make these statements a little simpler.
[]
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0[]
Quoted 9 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c static void halbtc_display_wifi_status(struct · line 881
Quoted 9 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +0
-4@@ -874,11 +874,10 @@ static void halbtc_display_wifi_status(struct btc_coexist *btcoexist, seq_printf(m, "\n %-35s = %s / %s/ %s/ AP=%d ", "Wifi freq/ bw/ traffic", gl_btc_wifi_freq_string[wifi_freq], - ((wifi_under_b_mode) ? "11b" : - gl_btc_wifi_bw_string[wifi_bw]), - ((!wifi_busy) ? "idle" : ((BTC_WIFI_TRAFFIC_TX == - wifi_traffic_dir) ?"uplink" :
Quoted 2 lines
Review static void halbtc_display_wifi_status(struct · line 878
Quoted 2 lines
(quoted diff) +1
-1- "downlink")), + wifi_under_b_mode ? "11b" :gl_btc_wifi_bw_string[wifi_bw],
Quoted 13 lines
Review
Quoted 9 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c static void halbtc_display_wifi_status(struct btc_coexist *btcoexist, · line 880
Quoted 3 lines
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +3
-0+ (!wifi_busy ? "idle" : + wifi_traffic_dir == BTC_WIFI_TRAFFIC_TX ? "uplink" : + "downlink"),
I think this would be better(quoted diff) +3
-0+ !wifi_busy ? "idle" : + (wifi_traffic_dir == BTC_WIFI_TRAFFIC_TX ? "uplink" : + "downlink"),It seems most repeated test1 ? : test2 ? : test3 ?:
uses do not have the style you suggest in the kernel.
Your change is
(test1 ? : test2 ? :)
So, I think you would like to have parenthesis intentionally. If so,
test1 ? : (test2 ? :)
would be better.
If not,
test1 ? : test2 ? :
may be what you want (without any parenthesis).
Re: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 9 lines · Pkshih
So, I think you would like to have parenthesis intentionally. If so,
test1 ? : (test2 ? :)
would be better.If not,
test1 ? : test2 ? :
may be what you want (without any parenthesis).
Use whatever style you like, it's unimportant to me and it's not worth spending any real time on it.
Re: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 7 lines · Joe Perches
Quoted 6 lines · Pkshih
So, I think you would like to have parenthesis intentionally. If so,
test1 ? : (test2 ? :)
would be better.
Quoted 6 lines
Quoted 3 lines
If not,
test1 ? : test2 ? :
may be what you want (without any parenthesis).Use whatever style you like, it's unimportant to me and it's not worth spending any real time on it.
If you are so busy, why did you jump in with patches that you knew I was already working on? You knew because you critiqued my first submission.
@Kalle: Please drop my contributions in the sequence "PATCH v2 00/15] rtlwifi: Change RT_TRACE into rtl_dbg for all drivers".
Larry
Re: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 12 lines · Larry Finger
Quoted 11 lines · Joe Perches
Quoted 9 lines · Pkshih
So, I think you would like to have parenthesis intentionally. If so,
test1 ? : (test2 ? :)
would be better.If not,
test1 ? : test2 ? :
may be what you want (without any parenthesis).
Quoted 5 lines
Quoted 2 lines
Use whatever style you like, it's unimportant to me and it's not worth spending any real time on it.
If you are so busy, why did you jump in with patches that you knew I was already working on? You knew because you critiqued my first submission.
Because it was over a week and you didn't reply
to my original message nor did you cc me on any
changes you made to your patch?
I can't read every patch I'm not cc'd on.
Re: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
In reply to Larry FingerQuoted 12 lines · Larry Finger
Quoted 11 lines · Joe Perches
Quoted 9 lines · Pkshih
So, I think you would like to have parenthesis intentionally. If so,
test1 ? : (test2 ? :)
would be better.If not,
test1 ? : test2 ? :
may be what you want (without any parenthesis).
Quoted 6 lines
Quoted 2 lines
Use whatever style you like, it's unimportant to me and it's not worth spending any real time on it.
If you are so busy, why did you jump in with patches that you knew I was already working on? You knew because you critiqued my first submission.
Yeah, I don't understand this either. First stepping on Larry's work and when after getting review comments claiming being busy and not caring is contradicting.
Quoted 2 lines
@Kalle: Please drop my contributions in the sequence "PATCH v2 00/15]
rtlwifi: ChangeRT_TRACEintortl_dbgfor all drivers".
Is there a technical reason for that? I prefer that patchset more, nicely split in smaller patches and it's fully available from patchwork.
Patch 15 had a build problem but I can drop that for now, it can be resent separately:
https://patchwork.kernel.org/patch/11681621/
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 2/6] rtlwifi: Remove unnecessary parenthese in rtl_dbg uses
Quoted 16 lines · Kalle Valo
Quoted 15 lines · Larry Finger
Quoted 13 lines · Joe Perches
Quoted 9 lines · Pkshih
So, I think you would like to have parenthesis intentionally. If so,
test1 ? : (test2 ? :)
would be better.If not,
test1 ? : test2 ? :
may be what you want (without any parenthesis).Use whatever style you like, it's unimportant to me and it's not worth spending any real time on it.
Quoted 7 lines
Quoted 3 lines
If you are so busy, why did you jump in with patches that you knew I was already working on? You knew because you critiqued my first submission.
Yeah, I don't understand this either. First stepping on Larry's work and when after getting review comments claiming being busy and not caring is contradicting.
I didn't say I was busy, I said I didn't care.
And it's not stepping on anyone's work, it's
a trivial contribution. Take it or not.
It's been months btw, the pace of the work isn't
particularly fast here.
PATCH 3/6 rtlwifi: Better spacing around rtl_dbg uses
In reply to Joe PerchesUse a more typical kernel style for rtl_dbg uses.
Miscellanea:
o Remove unnecessary braces and unindent a case statement
o Realign or'd values and add parentheses
--- drivers/net/wireless/realtek/rtlwifi/ps.c | 4 +- .../wireless/realtek/rtlwifi/rtl8188ee/hw.c | 2 +- .../wireless/realtek/rtlwifi/rtl8192cu/hw.c | 2 +- .../wireless/realtek/rtlwifi/rtl8192ee/fw.c | 36 +++++++-------- .../wireless/realtek/rtlwifi/rtl8192ee/phy.c | 10 ++--- .../rtlwifi/rtl8723ae/hal_bt_coexist.c | 6 ++- .../realtek/rtlwifi/rtl8723ae/hal_btc.c | 6 ++- .../wireless/realtek/rtlwifi/rtl8821ae/dm.c | 2 +- .../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 +- .../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 44 +++++++++---------- 10 files changed, 59 insertions(+), 55 deletions(-)
drivers/net/wireless/realtek/rtlwifi/ps.c +2 -2
@@ -901,7 +901,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw , u8 p2p_ps_state)struct rtl_ps_ctl *rtlps =rtl_psc (rtl_priv (hw));struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); -rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ," p2p state %x\n" , p2p_ps_state); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ," p2p state %x\n" , p2p_ps_state);switch (p2p_ps_state) {case P2P_PS_DISABLE : p2pinfo->p2p_ps_state = p2p_ps_state;
@@ -955,7 +955,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw , u8 p2p_ps_state) }rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"ctwindow %x oppps %x\n" , - p2pinfo->ctwindow , p2pinfo->opp_ps); + p2pinfo->ctwindow, p2pinfo->opp_ps); rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "count %x duration %x index %x interval %x start time %x noa num %x\n", p2pinfo->noa_count_type[0],
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +1 -1
@@ -1561,7 +1561,7 @@ static void read_power_value_fromprom(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"hal_ReadPowerValueFromPROM88E():PROMContent[0x%x]=0x%x\n" , - (eeaddr+1 ), hwinfo[eeaddr+1 ]); + eeaddr +1 , hwinfo[eeaddr +1 ]);if (0xFF == hwinfo[eeaddr+1 ])/*YJ,add,120316*/ autoload_fail = true;
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c +1 -1
@@ -1438,7 +1438,7 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw)rtl_write_dword (rtlpriv,REG_TCR , value32); value32 |=TSFRST ;rtl_write_dword (rtlpriv,REG_TCR , value32); -rtl_dbg (rtlpriv,COMP_INIT |COMP_BEACON ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_INIT |COMP_BEACON ,DBG_LOUD ,"SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n" , value32);/* TODO: Modify later (Find the right parameters)
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c +18 -18
@@ -36,7 +36,7 @@ static void _rtl92ee_write_fw(struct ieee80211_hw *hw,u32 pagenums, remainsize;u32 page, offset; -rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"FW size is %d bytes,\n" , size); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"FW size is %d bytes,\n" , size);rtl_fill_dummy (bufferptr, &size);
@@ -119,7 +119,7 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) pfwdata = (u8 *)rtlhal->pfirmware; fwsize = rtlhal->fwsize;rtl_dbg (rtlpriv,COMP_FW ,DBG_DMESG , -"normal Firmware SIZE %d\n" , fwsize); +"normal Firmware SIZE %d\n" , fwsize);if (IS_FW_HEADER_EXIST (pfwheader)) { rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,
@@ -180,12 +180,12 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,if (ppsc->dot11_psmode !=EACTIVE || ppsc->inactive_pwrstate ==ERFOFF ) { -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"FillH2CCommand8192E(): Return because RF is off!!!\n" );return ; } -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"come in\n" ); +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"come in\n" );/* 1. Prevent race condition in setting H2C cmd. * (copy from MgntActSet_RF_State().)
@@ -193,7 +193,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,while (true) {spin_lock_irqsave (&rtlpriv->locks.h2c_lock, flag);if (rtlhal->h2c_setinprogress) { -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"H2C set in progress! Wait to set..element_id(%d).\n" , element_id);
@@ -201,7 +201,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,spin_unlock_irqrestore (&rtlpriv->locks.h2c_lock, flag); h2c_waitcounter++; -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"Wait 100 us (%d times)...\n" , h2c_waitcounter);udelay (100 );
@@ -263,7 +263,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,while (!isfw_read) { wait_h2c_limmit--;if (wait_h2c_limmit ==0 ) { -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"Waiting too long for FW read clear HMEBox(%d)!!!\n" , boxnum);break ;
@@ -272,7 +272,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, isfw_read =_rtl92ee_check_fw_read_last_h2c (hw, boxnum); u1b_tmp =rtl_read_byte (rtlpriv,0x130 ); -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n" , boxnum, u1b_tmp); }
@@ -282,7 +282,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,* H2C cmd, break and give up this H2C. */ if (!isfw_read) { -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"Write H2C reg BOX[%d] fail,Fw don't read.\n" , boxnum);break ;
@@ -291,7 +291,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,memset (boxcontent,0 ,sizeof (boxcontent));memset (boxextcontent,0 ,sizeof (boxextcontent)); boxcontent[0 ] = element_id; -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"Write element_id box_reg(%4x) = %2x\n" , box_reg, element_id);
@@ -340,7 +340,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,if (rtlhal->last_hmeboxnum ==4 ) rtlhal->last_hmeboxnum =0 ; -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"pHalData->last_hmeboxnum = %d\n" , rtlhal->last_hmeboxnum); }
@@ -349,7 +349,7 @@ static void _rtl92ee_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, rtlhal->h2c_setinprogress = false;spin_unlock_irqrestore (&rtlpriv->locks.h2c_lock, flag); -rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"go out\n" ); +rtl_dbg (rtlpriv,COMP_CMD ,DBG_LOUD ,"go out\n" ); } void rtl92ee_fill_h2c_cmd(struct ieee80211_hw *hw,
@@ -388,7 +388,7 @@ void rtl92ee_firmware_selfreset(struct ieee80211_hw *hw) u1b_tmp =rtl_read_byte (rtlpriv,REG_SYS_FUNC_EN +1 );rtl_write_byte (rtlpriv,REG_SYS_FUNC_EN +1 , (u1b_tmp |BIT (2 ))); -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ," _8051Reset92E(): 8051 reset success .\n" ); }
@@ -750,7 +750,7 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) b_dlok = true;if (b_dlok) { -rtl_dbg (rtlpriv,COMP_POWER ,DBG_LOUD , +rtl_dbg (rtlpriv,COMP_POWER ,DBG_LOUD ,"Set RSVD page location to Fw.\n" );RT_PRINT_DATA (rtlpriv,COMP_CMD ,DBG_LOUD ,"H2C_RSVDPAGE:\n" , u1rsvdpageloc,3 );
@@ -783,11 +783,11 @@ void rtl92ee_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)switch (p2p_ps_state) {case P2P_PS_DISABLE : -rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_DISABLE\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_DISABLE\n" );memset (p2p_ps_offload,0 ,sizeof (*p2p_ps_offload));break ;case P2P_PS_ENABLE : -rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_ENABLE\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_ENABLE\n" );/* update CTWindow value. */ if (p2pinfo->ctwindow >0 ) { p2p_ps_offload->ctwindow_en =1 ;
@@ -838,11 +838,11 @@ void rtl92ee_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) }break ;case P2P_PS_SCAN : -rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_SCAN\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_SCAN\n" ); p2p_ps_offload->discovery =1 ;break ;case P2P_PS_SCAN_DONE : -rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_SCAN_DONE\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"P2P_PS_SCAN_DONE\n" ); p2p_ps_offload->discovery =0 ; p2pinfo->p2p_ps_state =P2P_PS_ENABLE ;break ;
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c +5 -5
@@ -663,7 +663,7 @@ static bool _rtl92ee_phy_config_mac_with_headerfile(struct ieee80211_hw *hw) arraylength =RTL8192EE_MAC_ARRAY_LEN ; ptrarray =RTL8192EE_MAC_ARRAY ;rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"Img:RTL8192EE_MAC_ARRAY LEN %d\n" , arraylength); +"Img:RTL8192EE_MAC_ARRAY LEN %d\n" , arraylength);for (i =0 ; i < arraylength; i = i +2 )rtl_write_byte (rtlpriv, ptrarray[i], (u8 )ptrarray[i +1 ]);return true;
@@ -915,7 +915,7 @@ bool rtl92ee_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, len =RTL8192EE_RADIOA_ARRAY_LEN ; array =RTL8192EE_RADIOA_ARRAY ;rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"Radio_A:RTL8192EE_RADIOA_ARRAY %d\n" , len); +"Radio_A:RTL8192EE_RADIOA_ARRAY %d\n" , len);rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"Radio No %x\n" , rfpath);for (i =0 ; i < len; i = i +2 ) { v1 = array[i];
@@ -962,7 +962,7 @@ bool rtl92ee_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, len =RTL8192EE_RADIOB_ARRAY_LEN ; array =RTL8192EE_RADIOB_ARRAY ;rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"Radio_A:RTL8192EE_RADIOB_ARRAY %d\n" , len); +"Radio_A:RTL8192EE_RADIOB_ARRAY %d\n" , len);rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"Radio No %x\n" , rfpath);for (i =0 ; i < len; i = i +2 ) { v1 = array[i];
@@ -2724,7 +2724,7 @@ static void _rtl92ee_phy_set_rfpath_switch(struct ieee80211_hw *hw,struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw));struct rtl_efuse *rtlefuse =rtl_efuse (rtl_priv (hw)); -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"\n" );if (is_hal_stop (rtlhal)) {u8 u1btmp;
@@ -2998,7 +2998,7 @@ static void rtl92ee_phy_set_io(struct ieee80211_hw *hw)case IO_CMD_RESUME_DM_BY_SCAN :rtl92ee_dm_write_dig (hw, rtlphy->initgain_backup.xaagccore1);rtl92ee_dm_write_cck_cca_thres (hw, rtlphy->initgain_backup.cca); -rtl_dbg (rtlpriv,COMP_CMD ,DBG_TRACE ,"no set txpower\n" ); +rtl_dbg (rtlpriv,COMP_CMD ,DBG_TRACE ,"no set txpower\n" );rtl92ee_phy_set_txpower_level (hw, rtlphy->current_channel);break ;case IO_CMD_PAUSE_BAND0_DM_BY_SCAN :
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c +4 -2
@@ -369,8 +369,10 @@ void rtl8723e_dm_bt_balance(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_TRACE ,"[DM][BT], Balance=[%s:%dms:%dms], write 0xc=0x%x\n" , - balance_on ?"ON" :"OFF" , ms0, ms1, h2c_parameter[0 ]<<16 | - h2c_parameter[1 ]<<8 | h2c_parameter[2 ]); + balance_on ?"ON" :"OFF" , ms0, ms1, + (h2c_parameter[0 ] <<16 | + h2c_parameter[1 ] <<8 | + h2c_parameter[2 ]));rtl8723e_fill_h2c_cmd (hw,0xc ,3 , h2c_parameter); }
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c +4 -2
@@ -70,7 +70,9 @@ void rtl_8723e_bt_wifi_media_status_notify(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_DMESG ,"[BTCoex], FW write 0x19=0x%x\n" , - h2c_parameter[0 ]<<16 |h2c_parameter[1 ]<<8 |h2c_parameter[2 ]); + (h2c_parameter[0 ] <<16 | + h2c_parameter[1 ] <<8 | + h2c_parameter[2 ]));rtl8723e_fill_h2c_cmd (hw,0x19 ,3 , h2c_parameter); }
@@ -1704,7 +1706,7 @@ void rtl_8723e_c2h_command_handle(struct ieee80211_hw *hw) c2h_event.cmd_seq =rtl_read_byte (rtlpriv,REG_C2HEVT_MSG_NORMAL +1 );rtl_dbg (rtlpriv,COMP_FW ,DBG_DMESG ,"cmd_id: %d, cmd_len: %d, cmd_seq: %d\n" , - c2h_event.cmd_id , c2h_event.cmd_len, c2h_event.cmd_seq); + c2h_event.cmd_id, c2h_event.cmd_len, c2h_event.cmd_seq); u1b_tmp =rtl_read_byte (rtlpriv,0x01AF );if (u1b_tmp ==C2H_EVT_HOST_CLOSE ) {return ;
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c +1 -1
@@ -1651,7 +1651,7 @@ void rtl8812ae_dm_txpower_tracking_callback_thermalmeter("[Path-%c] PowerIndexOffset(%d) =DeltaPowerIndex(%d) -DeltaPowerIndexLast(%d)\n" , (p ==RF90_PATH_A ?'A' :'B' ), rtldm->power_index_offset[p], - rtldm->delta_power_index[p] , + rtldm->delta_power_index[p], rtldm->delta_power_index_last[p]); rtldm->ofdm_index[p] =
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +1 -1
@@ -761,7 +761,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)u32 us_nav_upper = *(u32 *)val;if (us_nav_upper >HAL_92C_NAV_UPPER_UNIT *0xFF ) { -rtl_dbg (rtlpriv,COMP_INIT ,DBG_WARNING , +rtl_dbg (rtlpriv,COMP_INIT ,DBG_WARNING ,"The setting value (0x%08X us) of NAV_UPPER is larger than (%d * 0xFF)!!!\n" , us_nav_upper,HAL_92C_NAV_UPPER_UNIT );break ;
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +22 -22
63 lines not on this page · raw message
Signature · 1 line
2.26.0
PATCH 4/6 rtlwifi: Convert rtl_dbg embedded function names to %s: ..., __func__
In reply to Joe PerchesUse a more typical kernel style for embedded function names in debug logging statements.
--- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 3 +-- drivers/net/wireless/realtek/rtlwifi/cam.c | 14 ++++++-------- drivers/net/wireless/realtek/rtlwifi/core.c | 7 ++++--- drivers/net/wireless/realtek/rtlwifi/efuse.c | 8 ++++---- .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 3 +-- .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 3 +-- .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 3 +-- .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 2 +- .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c | 11 +++++------ .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 3 +-- .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 3 +-- .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 11 ++++------- .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 4 ++-- .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 11 ++++------- .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 10 ++++++---- 15 files changed, 42 insertions(+), 54 deletions(-)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +1 -2
@@ -129,8 +129,7 @@ static u8 halbtc_get_wifi_central_chnl(struct btc_coexist *btcoexist)if (rtlphy->current_channel !=0 ) chnl = rtlphy->current_channel; -rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"static halbtc_get_wifi_central_chnl:%d\n" , chnl); +rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD ,"%s:%d\n" , __func__, chnl);return chnl; }
drivers/net/wireless/realtek/rtlwifi/cam.c +6 -8
@@ -142,9 +142,9 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw,rtl_write_dword (rtlpriv, rtlpriv->cfg->maps[RWCAM ], ul_command);rtl_dbg (rtlpriv,COMP_SEC ,DBG_DMESG , -"rtl_cam_delete_one_entry(): WRITE A4: %x\n" ,0 ); +"%s: WRITE A4: %x\n" , __func__,0 );rtl_dbg (rtlpriv,COMP_SEC ,DBG_DMESG , -"rtl_cam_delete_one_entry(): WRITE A0: %x\n" , ul_command); +"%s: WRITE A0: %x\n" , __func__, ul_command);return 0 ;
@@ -196,9 +196,9 @@ void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index)rtl_write_dword (rtlpriv, rtlpriv->cfg->maps[RWCAM ], ul_command);rtl_dbg (rtlpriv,COMP_SEC ,DBG_DMESG , -"rtl_cam_mark_invalid(): WRITE A4: %x\n" , ul_content); +"%s: WRITE A4: %x\n" , __func__, ul_content);rtl_dbg (rtlpriv,COMP_SEC ,DBG_DMESG , -"rtl_cam_mark_invalid(): WRITE A0: %x\n" , ul_command); +"%s: WRITE A0: %x\n" , __func__, ul_command); }EXPORT_SYMBOL (rtl_cam_mark_invalid);
@@ -246,11 +246,9 @@ void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index)rtl_write_dword (rtlpriv, rtlpriv->cfg->maps[RWCAM ], ul_command);rtl_dbg (rtlpriv,COMP_SEC ,DBG_LOUD , -"rtl_cam_empty_entry(): WRITE A4: %x\n" , - ul_content); +"%s: WRITE A4: %x\n" , __func__, ul_content);rtl_dbg (rtlpriv,COMP_SEC ,DBG_LOUD , -"rtl_cam_empty_entry(): WRITE A0: %x\n" , - ul_command); +"%s: WRITE A0: %x\n" , __func__, ul_command); } }
drivers/net/wireless/realtek/rtlwifi/core.c +4 -3
@@ -1766,7 +1766,8 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, do { cfg_cmd = pwrcfgcmd[ary_idx]; rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, - "rtl_hal_pwrseqcmdparsing(): offset(%#x),cut_msk(%#x), famsk(%#x), interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), value(%#x)\n", + "%s: offset(%#x),cut_msk(%#x), famsk(%#x), interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), value(%#x)\n", + __func__, GET_PWR_CFG_OFFSET(cfg_cmd), GET_PWR_CFG_CUT_MASK(cfg_cmd), GET_PWR_CFG_FAB_MASK(cfg_cmd),
@@ -1819,7 +1820,7 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,break ;case PWR_CMD_DELAY :rtl_dbg (rtlpriv,COMP_INIT ,DBG_TRACE , -"rtl_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n" ); +"%s: PWR_CMD_DELAY\n" , __func__);if (GET_PWR_CFG_VALUE (cfg_cmd) ==PWRSEQ_DELAY_US )udelay (GET_PWR_CFG_OFFSET (cfg_cmd));
@@ -1828,7 +1829,7 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,break ;case PWR_CMD_END :rtl_dbg (rtlpriv,COMP_INIT ,DBG_TRACE , -"rtl_hal_pwrseqcmdparsing(): PWR_CMD_END\n" ); +"%s: PWR_CMD_END\n" , __func__);return true;default : WARN_ONCE(true,
drivers/net/wireless/realtek/rtlwifi/efuse.c +4 -4
@@ -212,8 +212,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)if ((_offset + _size_byte) > rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE ]) {rtl_dbg (rtlpriv,COMP_EFUSE ,DBG_LOUD , -"read_efuse(): Invalid offset(%#x) with read bytes(%#x)!!\n" , - _offset, _size_byte); +"%s: Invalid offset(%#x) with read bytes(%#x)!!\n" , + __func__, _offset, _size_byte);return ; }
@@ -377,8 +377,8 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw) result = false;rtl_dbg (rtlpriv,COMP_EFUSE ,DBG_LOUD , -"efuse_shadow_update_chk(): totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n" , - totalbytes, hdr_num, words_need, efuse_used); +"%s: totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n" , + __func__, totalbytes, hdr_num, words_need, efuse_used);return result; }
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c +1 -2
@@ -881,8 +881,7 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw)/*Initilization (7 steps in total) */ rtlpriv->dm.txpower_trackinginit = true; -rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"dm_txpower_track_cb_therm\n" ); +rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD ,"%s\n" , __func__); thermalvalue = (u8 )rtl_get_rfreg (hw,RF90_PATH_A ,RF_T_METER ,0xfc00 );
drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c +1 -2
@@ -713,8 +713,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hwu8 ofdm_min_index =6 , rf; rtlpriv->dm.txpower_trackinginit = true; -rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"rtl92c_dm_txpower_tracking_callback_thermalmeter\n" ); +rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD ,"%s\n" , __func__); thermalvalue = (u8 )rtl_get_rfreg (hw,RF90_PATH_A ,RF_T_METER ,0x1f );
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c +1 -2
@@ -606,8 +606,7 @@ static void phy_convert_txpwr_dbm_to_rel_val(struct ieee80211_hw *hw) 0, 3, base); } -rtl_dbg (rtlpriv,COMP_POWER ,DBG_TRACE , -"<==phy_convert_txpwr_dbm_to_rel_val()\n" ); +rtl_dbg (rtlpriv,COMP_POWER ,DBG_TRACE ,"<==%s\n" , __func__); }static void _rtl92ee_phy_txpower_by_rate_configuration (struct ieee80211_hw *hw)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c +1 -1
@@ -827,7 +827,7 @@ void rtl8723e_dm_bt_coexist(struct ieee80211_hw *hw)if (!rtlpriv->btcoexist.init_set) {rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_LOUD , -"[DM][BT], rtl8723e_dm_bt_coexist()\n" ); +"[DM][BT], %s\n" , __func__);rtl8723e_dm_init_bt_coexist (hw); }
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c +5 -6
@@ -343,8 +343,7 @@ long rtl8723e_dm_bt_get_rx_ss(struct ieee80211_hw *hw) = rtlpriv->dm.entry_min_undec_sm_pwdb; }rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_TRACE , -"rtl8723e_dm_bt_get_rx_ss() = %ld\n" , - undecoratedsmoothed_pwdb); +"%s: %ld\n" , __func__, undecoratedsmoothed_pwdb);return undecoratedsmoothed_pwdb; }
@@ -461,13 +460,13 @@ void rtl8723e_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw)struct rtl_priv *rtlpriv =rtl_priv (hw);rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_TRACE , -"rtl8723e_dm_bt_sw_coex_all_off()\n" ); +"%s\n" , __func__);if (rtlpriv->btcoexist.sw_coexist_all_off)return ;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_TRACE , -"rtl8723e_dm_bt_sw_coex_all_off(), real Do\n" ); +"%s: real Do\n" , __func__);rtl8723e_dm_bt_sw_coex_all_off_8723a (hw); rtlpriv->btcoexist.sw_coexist_all_off = true; }
@@ -477,12 +476,12 @@ void rtl8723e_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw)struct rtl_priv *rtlpriv =rtl_priv (hw);rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_TRACE , -"rtl8723e_dm_bt_hw_coex_all_off()\n" ); +"%s\n" , __func__);if (rtlpriv->btcoexist.hw_coexist_all_off)return ;rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_TRACE , -"rtl8723e_dm_bt_hw_coex_all_off(), real Do\n" ); +"%s: real Do\n" , __func__);rtl8723e_dm_bt_hw_coex_all_off_8723a (hw);
drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c +1 -2
@@ -747,8 +747,7 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter(/*Initilization ( 7 steps in total )*/ rtlpriv->dm.txpower_trackinginit = true; -rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"rtl8723be_dm_txpower_tracking_callback_thermalmeter\n" ); +rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD ,"%s\n" , __func__); thermalvalue = (u8 )rtl_get_rfreg (hw,RF90_PATH_A ,RF_T_METER ,0xfc00 );
drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c +1 -2
@@ -477,8 +477,7 @@ static void _rtl8723be_phy_convert_txpower_dbm_to_relative_value( &rtlphy->tx_power_by_rate_offset[BAND_ON_2_4G ][rfpath][RF_2TX ][7 ], 0, 3, base); -rtl_dbg (rtlpriv,COMP_POWER ,DBG_TRACE , -"<===_rtl8723be_phy_convert_txpower_dbm_to_relative_value()\n" ); +rtl_dbg (rtlpriv,COMP_POWER ,DBG_TRACE ,"<===%s\n" , __func__); }static void phy_txpower_by_rate_config (struct ieee80211_hw *hw)
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c +4 -7
@@ -1187,8 +1187,7 @@ void rtl8812ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw, tx_rate =rtl8821ae_hw_rate_to_mrate (hw, rtldm->tx_rate); -rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"===>rtl8812ae_dm_txpwr_track_set_pwr\n" ); +rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD ,"===>%s\n" , __func__);/*20130429 Mimic Modify High Rate BBSwing Limit.*/ if (tx_rate !=0xFF ) {/*CCK*/
@@ -1265,7 +1264,7 @@ void rtl8812ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,if (method ==BBSWING ) {rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"===>rtl8812ae_dm_txpwr_track_set_pwr\n" ); +"===>%s\n" , __func__);if (rf_path ==RF90_PATH_A ) {u32 tmp;
@@ -1794,8 +1793,7 @@ void rtl8812ae_dm_txpower_tracking_callback_thermalmeter(if (delta_iqk >=IQK_THRESHOLD )rtl8812ae_do_iqk (hw, delta_iqk, thermal_value,8 ); -rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"<===rtl8812ae_dm_txpower_tracking_callback_thermalmeter\n" ); +rtl_dbg (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD ,"<===%s\n" , __func__); } static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw,
@@ -2492,8 +2490,7 @@ static void rtl8821ae_dm_check_edca_turbo(struct ieee80211_hw *hw)bool b_bias_on_rx = false;bool b_edca_turbo_on = false; -rtl_dbg (rtlpriv,COMP_TURBO ,DBG_LOUD , -"rtl8821ae_dm_check_edca_turbo=====>\n" ); +rtl_dbg (rtlpriv,COMP_TURBO ,DBG_LOUD ,"%s=====>\n" , __func__);rtl_dbg (rtlpriv,COMP_TURBO ,DBG_LOUD ,"Original BE PARAM: 0x%x\n" ,rtl_read_dword (rtlpriv,DM_REG_EDCA_BE_11N ));
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +2 -2
@@ -1987,7 +1987,7 @@ int rtl8821ae_hw_init(struct ieee80211_hw *hw)rtl8821ae_dm_init (hw);rtl8821ae_macid_initialize_mediastatus (hw); -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"rtl8821ae_hw_init() <====\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"%s <====\n" , __func__);return err; }
@@ -2183,7 +2183,7 @@ int rtl8821ae_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type {struct rtl_priv *rtlpriv =rtl_priv (hw); -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"rtl8821ae_set_network_type!\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"%s!\n" , __func__);if (_rtl8821ae_set_media_status (hw, type))return -EOPNOTSUPP ;
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +4 -7
@@ -723,7 +723,7 @@ void rtl8821ae_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band) }rtl_dbg (rtlpriv,COMP_SCAN ,DBG_TRACE , -"<==rtl8821ae_phy_switch_wirelessband():Switch Band OK.\n" ); +"<==%s:Switch Band OK\n" , __func__);return ; }
@@ -1431,8 +1431,7 @@ static void _rtl8812ae_phy_convert_txpower_limit_to_power_index(struct ieee80211 } } } -rtl_dbg (rtlpriv,COMP_INIT ,DBG_TRACE , -"<===== _rtl8812ae_phy_convert_txpower_limit_to_power_index()\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_TRACE ,"<===== %s\n" , __func__); }static void _rtl8821ae_phy_init_txpower_limit (struct ieee80211_hw *hw)
@@ -1441,8 +1440,7 @@ static void _rtl8821ae_phy_init_txpower_limit(struct ieee80211_hw *hw)struct rtl_phy *rtlphy = &rtlpriv->phy;u8 i, j, k, l, m; -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"=====> _rtl8821ae_phy_init_txpower_limit()!\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"=====> %s!\n" , __func__);for (i =0 ; i <MAX_REGULATION_NUM ; ++i) {for (j =0 ; j <MAX_2_4G_BANDWIDTH_NUM ; ++j)
@@ -1463,8 +1461,7 @@ static void _rtl8821ae_phy_init_txpower_limit(struct ieee80211_hw *hw) = MAX_POWER_INDEX; } -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"<===== _rtl8821ae_phy_init_txpower_limit()!\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"<===== %s!\n" , __func__); }static void _rtl8821ae_phy_convert_txpower_dbm_to_relative_value (struct ieee80211_hw *hw)
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c +6 -4
@@ -559,8 +559,8 @@ static u8 rtl8821ae_bw_mapping(struct ieee80211_hw *hw,u8 bw_setting_of_desc =0 ;rtl_dbg (rtlpriv,COMP_SEND ,DBG_TRACE , -"rtl8821ae_bw_mapping, current_chan_bw %d, packet_bw %d\n" , - rtlphy->current_chan_bw, ptcb_desc->packet_bw); +"%s: current_chan_bw %d, packet_bw %d\n" , + __func__, rtlphy->current_chan_bw, ptcb_desc->packet_bw);if (rtlphy->current_chan_bw ==HT_CHANNEL_WIDTH_80 ) {if (ptcb_desc->packet_bw ==HT_CHANNEL_WIDTH_80 )
@@ -603,7 +603,8 @@ static u8 rtl8821ae_sc_mapping(struct ieee80211_hw *hw,VHT_DATA_SC_40_UPPER_OF_80MHZ ; else rtl_dbg(rtlpriv, COMP_SEND, DBG_LOUD, - "rtl8821ae_sc_mapping: Not Correct Primary40MHz Setting\n"); +"%s: Not Correct Primary40MHz Setting\n" , + __func__); }else { if ((mac->cur_40_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER) &&
@@ -631,7 +632,8 @@ static u8 rtl8821ae_sc_mapping(struct ieee80211_hw *hw,VHT_DATA_SC_20_UPPERST_OF_80MHZ ; else rtl_dbg(rtlpriv, COMP_SEND, DBG_LOUD, - "rtl8821ae_sc_mapping: Not Correct Primary40MHz Setting\n"); +"%s: Not Correct Primary40MHz Setting\n" , + __func__); } }else if (rtlphy->current_chan_bw ==HT_CHANNEL_WIDTH_20_40 ) {if (ptcb_desc->packet_bw ==HT_CHANNEL_WIDTH_20_40 ) {
Signature · 1 line
2.26.0
PATCH 5/6 rtlwifi: Avoid multiline dereferences in rtl_dbg uses
In reply to Joe PerchesUse a more typical kernel style in rtl_dbg uses.
--- .../wireless/realtek/rtlwifi/rtl8188ee/phy.c | 3 +- .../realtek/rtlwifi/rtl8192c/phy_common.c | 48 +++++++------------ .../wireless/realtek/rtlwifi/rtl8192ce/phy.c | 3 +- .../wireless/realtek/rtlwifi/rtl8192se/phy.c | 3 +- .../wireless/realtek/rtlwifi/rtl8723ae/phy.c | 48 +++++++------------ .../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 3 +- 6 files changed, 36 insertions(+), 72 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c +1 -2
@@ -2191,8 +2191,7 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG ,"Set ERFON sleeped:%d ms\n" ,jiffies_to_msecs (jiffies - - ppsc-> - last_sleep_jiffies)); + ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;rtl88ee_phy_set_rf_on (hw); }
drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +16 -32
144 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +1 -2
@@ -456,8 +456,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG ,"Set ERFON sleeped:%d ms\n" ,jiffies_to_msecs (jiffies - - ppsc-> - last_sleep_jiffies)); + ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;rtl92ce_phy_set_rf_on (hw); }
drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c +1 -2
@@ -541,8 +541,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_POWER ,DBG_DMESG ,"awake, sleeped:%d ms state_inap:%x\n" ,jiffies_to_msecs (jiffies - - ppsc-> - last_sleep_jiffies), + ppsc->last_sleep_jiffies), rtlpriv->psc.state_inap); ppsc->last_awake_jiffies = jiffies;rtl_write_word (rtlpriv,CMDR ,0x37FC );
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c +16 -32
144 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +1 -2
@@ -4738,8 +4738,7 @@ static bool _rtl8821ae_phy_set_rf_power_state(struct ieee80211_hw *hw,rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG ,"Set ERFON sleeped:%d ms\n" ,jiffies_to_msecs (jiffies - - ppsc-> - last_sleep_jiffies)); + ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;rtl8821ae_phy_set_rf_on (hw); }
Signature · 1 line
2.26.0
PATCH 6/6 rtlwifi: Convert sleeped to slept in rtl_dbg uses
In reply to Joe PerchesUse a more standard word.
--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c +1 -1
@@ -2189,7 +2189,7 @@ static bool _rtl88ee_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG , -"Set ERFON sleeped:%d ms\n" , +"Set ERFON slept:%d ms\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +1 -1
@@ -454,7 +454,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG , -"Set ERFON sleeped:%d ms\n" , +"Set ERFON slept:%d ms\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c +1 -1
@@ -398,7 +398,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG , -"Set ERFON sleeped:%d ms\n" , +"Set ERFON slept:%d ms\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +1 -1
@@ -3074,7 +3074,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_POWER ,DBG_DMESG , -"awake, sleeped:%d ms state_inap:%x\n" , +"awake, slept:%d ms state_inap:%x\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies), rtlpriv->psc.state_inap);
drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c +1 -1
@@ -539,7 +539,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_POWER ,DBG_DMESG , -"awake, sleeped:%d ms state_inap:%x\n" , +"awake, slept:%d ms state_inap:%x\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies), rtlpriv->psc.state_inap);
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c +1 -1
@@ -1562,7 +1562,7 @@ static bool _rtl8723e_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG , -"Set ERFON sleeped:%d ms\n" , +"Set ERFON slept:%d ms\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;
drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c +1 -1
@@ -2528,7 +2528,7 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,RT_CLEAR_PS_LEVEL (ppsc,RT_RF_OFF_LEVL_HALT_NIC ); }else {rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG , -"Set ERFON sleeped:%d ms\n" , +"Set ERFON slept:%d ms\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +1 -1
@@ -4736,7 +4736,7 @@ static bool _rtl8821ae_phy_set_rf_power_state(struct ieee80211_hw *hw, RT_RF_OFF_LEVL_HALT_NIC); }else {rtl_dbg (rtlpriv,COMP_RF ,DBG_DMESG , -"Set ERFON sleeped:%d ms\n" , +"Set ERFON slept:%d ms\n" ,jiffies_to_msecs (jiffies - ppsc->last_sleep_jiffies)); ppsc->last_awake_jiffies = jiffies;
Signature · 1 line
2.26.0
Quoted 4 lines · Joe Perches
RT_TRACEseems like it should be associated to tracing but it's not. It's a generic debug logging mechanism.
Rename it to a more typical name.
Miscellaneous neatening around these changes.
Patch 1/6 is over 1MB and is too large for some mailing lists.
These patches are based on wireless-drivers-next and are also available at:
git://repo.or.cz/linux-2.6/trivial-mods.git in branch 20200724_rtlwifi