diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2012-10-02 10:19:44 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 15:53:05 -0400 |
commit | ed9f0ed3b977f480a35ea3d3e9d966d89724185e (patch) | |
tree | 1aa92a31103fab5296040779baadabc2abd12a24 | |
parent | 264e989a0b347c61bd3258063eac8b86f55ff037 (diff) |
rtlwifi: rtl8192ce: rtl8192cu: use %*phC to dump small buffers
The patch changes a bit trace output format in the rtl_cam_program_entry() to
print prefix and the actual data on the same line. Moreover the %*phC outputs
each byte as 2 hex digits, which is slightly different to the original %x.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rtlwifi/cam.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c index 5b4b4d4eaf9e..ca69e35e50f1 100644 --- a/drivers/net/wireless/rtlwifi/cam.c +++ b/drivers/net/wireless/rtlwifi/cam.c | |||
@@ -52,11 +52,8 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, | |||
52 | u32 target_content = 0; | 52 | u32 target_content = 0; |
53 | u8 entry_i; | 53 | u8 entry_i; |
54 | 54 | ||
55 | RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, | 55 | RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "key_cont_128: %6phC\n", |
56 | "key_cont_128:\n %x:%x:%x:%x:%x:%x\n", | 56 | key_cont_128); |
57 | key_cont_128[0], key_cont_128[1], | ||
58 | key_cont_128[2], key_cont_128[3], | ||
59 | key_cont_128[4], key_cont_128[5]); | ||
60 | 57 | ||
61 | for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) { | 58 | for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) { |
62 | target_command = entry_i + CAM_CONTENT_COUNT * entry_no; | 59 | target_command = entry_i + CAM_CONTENT_COUNT * entry_no; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 86d73b32d995..038c02c9afed 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -1918,10 +1918,8 @@ static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw, | |||
1918 | (ratr_index << 28); | 1918 | (ratr_index << 28); |
1919 | rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80; | 1919 | rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80; |
1920 | RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, | 1920 | RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, |
1921 | "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n", | 1921 | "Rate_index:%x, ratr_val:%x, %5phC\n", |
1922 | ratr_index, ratr_bitmap, | 1922 | ratr_index, ratr_bitmap, rate_mask); |
1923 | rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3], | ||
1924 | rate_mask[4]); | ||
1925 | rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask); | 1923 | rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask); |
1926 | 1924 | ||
1927 | if (macid != 0) | 1925 | if (macid != 0) |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c index 4bbb711a36c5..7d36a94263b0 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | |||
@@ -2169,10 +2169,8 @@ void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level) | |||
2169 | ratr_index << 28); | 2169 | ratr_index << 28); |
2170 | rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80; | 2170 | rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80; |
2171 | RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, | 2171 | RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, |
2172 | "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n", | 2172 | "Rate_index:%x, ratr_val:%x, %5phC\n", |
2173 | ratr_index, ratr_bitmap, | 2173 | ratr_index, ratr_bitmap, rate_mask); |
2174 | rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3], | ||
2175 | rate_mask[4]); | ||
2176 | rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask); | 2174 | rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask); |
2177 | } | 2175 | } |
2178 | 2176 | ||