diff options
author | Hans Wennborg <hans@hanshq.net> | 2014-09-05 23:19:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-11 15:26:29 -0400 |
commit | 4f4378dead3792d21577739f07869fbd843dab23 (patch) | |
tree | c69233225820bab539995c32008f831ac91d572f | |
parent | 595a23fe1527261316e28d18cd06ac4b391d7ad1 (diff) |
rtlwifi: fix %d confusingly prefixed with 0x in format strings
Signed-off-by: Hans Wennborg <hans@hanshq.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 67d1ee6edcad..74a8ba4b8844 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -646,7 +646,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) | |||
646 | == 2) { | 646 | == 2) { |
647 | 647 | ||
648 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, | 648 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
649 | "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n", | 649 | "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%x\n", |
650 | prio, ring->idx, | 650 | prio, ring->idx, |
651 | skb_queue_len(&ring->queue)); | 651 | skb_queue_len(&ring->queue)); |
652 | 652 | ||
@@ -1469,7 +1469,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, | |||
1469 | 1469 | ||
1470 | if ((own == 1) && (hw_queue != BEACON_QUEUE)) { | 1470 | if ((own == 1) && (hw_queue != BEACON_QUEUE)) { |
1471 | RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, | 1471 | RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
1472 | "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n", | 1472 | "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n", |
1473 | hw_queue, ring->idx, idx, | 1473 | hw_queue, ring->idx, idx, |
1474 | skb_queue_len(&ring->queue)); | 1474 | skb_queue_len(&ring->queue)); |
1475 | 1475 | ||
@@ -1511,7 +1511,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, | |||
1511 | if ((ring->entries - skb_queue_len(&ring->queue)) < 2 && | 1511 | if ((ring->entries - skb_queue_len(&ring->queue)) < 2 && |
1512 | hw_queue != BEACON_QUEUE) { | 1512 | hw_queue != BEACON_QUEUE) { |
1513 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, | 1513 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
1514 | "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n", | 1514 | "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n", |
1515 | hw_queue, ring->idx, idx, | 1515 | hw_queue, ring->idx, idx, |
1516 | skb_queue_len(&ring->queue)); | 1516 | skb_queue_len(&ring->queue)); |
1517 | 1517 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c index 592125a5f19c..1961b8e28dc1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c | |||
@@ -677,7 +677,7 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw, | |||
677 | 677 | ||
678 | rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index] = data; | 678 | rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index] = data; |
679 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 679 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
680 | "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%ulx\n", | 680 | "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n", |
681 | rtlphy->pwrgroup_cnt, index, | 681 | rtlphy->pwrgroup_cnt, index, |
682 | rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index]); | 682 | rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index]); |
683 | if (index == 13) | 683 | if (index == 13) |
@@ -2531,7 +2531,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw, | |||
2531 | if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */ | 2531 | if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */ |
2532 | u4tmp = curveindex_5g[channel-1]; | 2532 | u4tmp = curveindex_5g[channel-1]; |
2533 | RTPRINT(rtlpriv, FINIT, INIT_IQK, | 2533 | RTPRINT(rtlpriv, FINIT, INIT_IQK, |
2534 | "ver 1 set RF-A, 5G, 0x28 = 0x%ulx !!\n", u4tmp); | 2534 | "ver 1 set RF-A, 5G, 0x28 = 0x%x !!\n", u4tmp); |
2535 | if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY && | 2535 | if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY && |
2536 | rtlpriv->rtlhal.interfaceindex == 1) { | 2536 | rtlpriv->rtlhal.interfaceindex == 1) { |
2537 | bneed_powerdown_radio = | 2537 | bneed_powerdown_radio = |
@@ -2550,7 +2550,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw, | |||
2550 | } else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) { | 2550 | } else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) { |
2551 | u4tmp = curveindex_2g[channel-1]; | 2551 | u4tmp = curveindex_2g[channel-1]; |
2552 | RTPRINT(rtlpriv, FINIT, INIT_IQK, | 2552 | RTPRINT(rtlpriv, FINIT, INIT_IQK, |
2553 | "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp); | 2553 | "ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n", u4tmp); |
2554 | if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY && | 2554 | if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY && |
2555 | rtlpriv->rtlhal.interfaceindex == 0) { | 2555 | rtlpriv->rtlhal.interfaceindex == 0) { |
2556 | bneed_powerdown_radio = | 2556 | bneed_powerdown_radio = |
@@ -2562,7 +2562,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw, | |||
2562 | } | 2562 | } |
2563 | rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp); | 2563 | rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp); |
2564 | RTPRINT(rtlpriv, FINIT, INIT_IQK, | 2564 | RTPRINT(rtlpriv, FINIT, INIT_IQK, |
2565 | "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", | 2565 | "ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n", |
2566 | rtl_get_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800)); | 2566 | rtl_get_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800)); |
2567 | if (bneed_powerdown_radio) | 2567 | if (bneed_powerdown_radio) |
2568 | _rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue); | 2568 | _rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue); |