aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-07-20 11:51:35 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-07-21 14:52:05 -0400
commit292b11926fec139c0ff103bc229bc6c079d0862f (patch)
treeb960f9363ee4eaa0846039e2e4f17e796a055651
parent6054069a03f77ffa686e2dfd5f07cff8ee40b72d (diff)
rtlwifi: Convert printks to pr_<level>
Use the current logging styles. Add pr_fmt where appropriate. Remove now unnecessary prefixes from printks. Convert hard coded prefix to __func__. Add a missing "\n" to a format. Signed-off-by: Joe Perches <joe@perches.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/base.c9
-rw-r--r--drivers/net/wireless/rtlwifi/cam.c4
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c5
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/hw.c69
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/mac.c11
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192de/sw.c8
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192se/hw.c10
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192se/phy.c5
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192se/rf.c4
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192se/sw.c6
-rw-r--r--drivers/net/wireless/rtlwifi/usb.c12
11 files changed, 72 insertions, 71 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 5f46efd6ec68..0b598db38da9 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include <linux/ip.h> 32#include <linux/ip.h>
31#include "wifi.h" 33#include "wifi.h"
32#include "rc.h" 34#include "rc.h"
@@ -397,8 +399,8 @@ void rtl_init_rfkill(struct ieee80211_hw *hw)
397 radio_state = rtlpriv->cfg->ops->radio_onoff_checking(hw, &valid); 399 radio_state = rtlpriv->cfg->ops->radio_onoff_checking(hw, &valid);
398 400
399 if (valid) { 401 if (valid) {
400 printk(KERN_INFO "rtlwifi: wireless switch is %s\n", 402 pr_info("wireless switch is %s\n",
401 rtlpriv->rfkill.rfkill_state ? "on" : "off"); 403 rtlpriv->rfkill.rfkill_state ? "on" : "off");
402 404
403 rtlpriv->rfkill.rfkill_state = radio_state; 405 rtlpriv->rfkill.rfkill_state = radio_state;
404 406
@@ -1401,8 +1403,7 @@ MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core");
1401static int __init rtl_core_module_init(void) 1403static int __init rtl_core_module_init(void)
1402{ 1404{
1403 if (rtl_rate_control_register()) 1405 if (rtl_rate_control_register())
1404 printk(KERN_ERR "rtlwifi: Unable to register rtl_rc," 1406 pr_err("Unable to register rtl_rc, use default RC !!\n");
1405 "use default RC !!\n");
1406 1407
1407 return 0; 1408 return 0;
1408} 1409}
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 66588c239eb8..7babb6acd957 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include "wifi.h" 32#include "wifi.h"
31#include "cam.h" 33#include "cam.h"
32 34
@@ -347,7 +349,7 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
347 /* Remove from HW Security CAM */ 349 /* Remove from HW Security CAM */
348 memset(rtlpriv->sec.hwsec_cam_sta_addr[i], 0, ETH_ALEN); 350 memset(rtlpriv->sec.hwsec_cam_sta_addr[i], 0, ETH_ALEN);
349 rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i); 351 rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);
350 printk(KERN_INFO "&&&&&&&&&del entry %d\n", i); 352 pr_info("&&&&&&&&&del entry %d\n", i);
351 } 353 }
352 } 354 }
353 return; 355 return;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index f9f2370e9256..49a064bdbce6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include <linux/firmware.h> 32#include <linux/firmware.h>
31#include "../wifi.h" 33#include "../wifi.h"
32#include "../pci.h" 34#include "../pci.h"
@@ -224,8 +226,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
224 u32 fwsize; 226 u32 fwsize;
225 enum version_8192c version = rtlhal->version; 227 enum version_8192c version = rtlhal->version;
226 228
227 printk(KERN_INFO "rtl8192c: Loading firmware file %s\n", 229 pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
228 rtlpriv->cfg->fw_name);
229 if (!rtlhal->pfirmware) 230 if (!rtlhal->pfirmware)
230 return 1; 231 return 1;
231 232
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 2b34764fbf73..814c05df51e8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include "../wifi.h" 32#include "../wifi.h"
31#include "../efuse.h" 33#include "../efuse.h"
32#include "../base.h" 34#include "../base.h"
@@ -337,7 +339,7 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
337 rtlefuse->board_type = boardType; 339 rtlefuse->board_type = boardType;
338 if (IS_HIGHT_PA(rtlefuse->board_type)) 340 if (IS_HIGHT_PA(rtlefuse->board_type))
339 rtlefuse->external_pa = 1; 341 rtlefuse->external_pa = 1;
340 printk(KERN_INFO "rtl8192cu: Board Type %x\n", rtlefuse->board_type); 342 pr_info("Board Type %x\n", rtlefuse->board_type);
341 343
342#ifdef CONFIG_ANTENNA_DIVERSITY 344#ifdef CONFIG_ANTENNA_DIVERSITY
343 /* Antenna Diversity setting. */ 345 /* Antenna Diversity setting. */
@@ -346,8 +348,7 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
346 else 348 else
347 rtl_efuse->antenna_cfg = registry_par->antdiv_cfg; /* 0:OFF, */ 349 rtl_efuse->antenna_cfg = registry_par->antdiv_cfg; /* 0:OFF, */
348 350
349 printk(KERN_INFO "rtl8192cu: Antenna Config %x\n", 351 pr_info("Antenna Config %x\n", rtl_efuse->antenna_cfg);
350 rtl_efuse->antenna_cfg);
351#endif 352#endif
352} 353}
353 354
@@ -384,71 +385,57 @@ static void _update_bt_param(_adapter *padapter)
384 pbtpriv->bBTNonTrafficModeSet = _FALSE; 385 pbtpriv->bBTNonTrafficModeSet = _FALSE;
385 pbtpriv->CurrentState = 0; 386 pbtpriv->CurrentState = 0;
386 pbtpriv->PreviousState = 0; 387 pbtpriv->PreviousState = 0;
387 printk(KERN_INFO "rtl8192cu: BT Coexistance = %s\n", 388 pr_info("BT Coexistance = %s\n",
388 (pbtpriv->BT_Coexist == _TRUE) ? "enable" : "disable"); 389 (pbtpriv->BT_Coexist == _TRUE) ? "enable" : "disable");
389 if (pbtpriv->BT_Coexist) { 390 if (pbtpriv->BT_Coexist) {
390 if (pbtpriv->BT_Ant_Num == Ant_x2) 391 if (pbtpriv->BT_Ant_Num == Ant_x2)
391 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 392 pr_info("BlueTooth BT_Ant_Num = Antx2\n");
392 "Ant_Num = Antx2\n");
393 else if (pbtpriv->BT_Ant_Num == Ant_x1) 393 else if (pbtpriv->BT_Ant_Num == Ant_x1)
394 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 394 pr_info("BlueTooth BT_Ant_Num = Antx1\n");
395 "Ant_Num = Antx1\n");
396 switch (pbtpriv->BT_CoexistType) { 395 switch (pbtpriv->BT_CoexistType) {
397 case BT_2Wire: 396 case BT_2Wire:
398 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 397 pr_info("BlueTooth BT_CoexistType = BT_2Wire\n");
399 "CoexistType = BT_2Wire\n");
400 break; 398 break;
401 case BT_ISSC_3Wire: 399 case BT_ISSC_3Wire:
402 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 400 pr_info("BlueTooth BT_CoexistType = BT_ISSC_3Wire\n");
403 "CoexistType = BT_ISSC_3Wire\n");
404 break; 401 break;
405 case BT_Accel: 402 case BT_Accel:
406 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 403 pr_info("BlueTooth BT_CoexistType = BT_Accel\n");
407 "CoexistType = BT_Accel\n");
408 break; 404 break;
409 case BT_CSR_BC4: 405 case BT_CSR_BC4:
410 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 406 pr_info("BlueTooth BT_CoexistType = BT_CSR_BC4\n");
411 "CoexistType = BT_CSR_BC4\n");
412 break; 407 break;
413 case BT_CSR_BC8: 408 case BT_CSR_BC8:
414 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 409 pr_info("BlueTooth BT_CoexistType = BT_CSR_BC8\n");
415 "CoexistType = BT_CSR_BC8\n");
416 break; 410 break;
417 case BT_RTL8756: 411 case BT_RTL8756:
418 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 412 pr_info("BlueTooth BT_CoexistType = BT_RTL8756\n");
419 "CoexistType = BT_RTL8756\n");
420 break; 413 break;
421 default: 414 default:
422 printk(KERN_INFO "rtl8192cu: BlueTooth BT_" 415 pr_info("BlueTooth BT_CoexistType = Unknown\n");
423 "CoexistType = Unknown\n");
424 break; 416 break;
425 } 417 }
426 printk(KERN_INFO "rtl8192cu: BlueTooth BT_Ant_isolation = %d\n", 418 pr_info("BlueTooth BT_Ant_isolation = %d\n",
427 pbtpriv->BT_Ant_isolation); 419 pbtpriv->BT_Ant_isolation);
428 switch (pbtpriv->BT_Service) { 420 switch (pbtpriv->BT_Service) {
429 case BT_OtherAction: 421 case BT_OtherAction:
430 printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = " 422 pr_info("BlueTooth BT_Service = BT_OtherAction\n");
431 "BT_OtherAction\n");
432 break; 423 break;
433 case BT_SCO: 424 case BT_SCO:
434 printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = " 425 pr_info("BlueTooth BT_Service = BT_SCO\n");
435 "BT_SCO\n");
436 break; 426 break;
437 case BT_Busy: 427 case BT_Busy:
438 printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = " 428 pr_info("BlueTooth BT_Service = BT_Busy\n");
439 "BT_Busy\n");
440 break; 429 break;
441 case BT_OtherBusy: 430 case BT_OtherBusy:
442 printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = " 431 pr_info("BlueTooth BT_Service = BT_OtherBusy\n");
443 "BT_OtherBusy\n");
444 break; 432 break;
445 default: 433 default:
446 printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = " 434 pr_info("BlueTooth BT_Service = BT_Idle\n");
447 "BT_Idle\n");
448 break; 435 break;
449 } 436 }
450 printk(KERN_INFO "rtl8192cu: BT_RadioSharedType = 0x%x\n", 437 pr_info("BT_RadioSharedType = 0x%x\n",
451 pbtpriv->BT_RadioSharedType); 438 pbtpriv->BT_RadioSharedType);
452 } 439 }
453} 440}
454 441
@@ -526,7 +513,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
526 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i]; 513 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
527 *((u16 *) (&rtlefuse->dev_addr[i])) = usvalue; 514 *((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
528 } 515 }
529 printk(KERN_INFO "rtl8192cu: MAC address: %pM\n", rtlefuse->dev_addr); 516 pr_info("MAC address: %pM\n", rtlefuse->dev_addr);
530 _rtl92cu_read_txpower_info_from_hwpg(hw, 517 _rtl92cu_read_txpower_info_from_hwpg(hw,
531 rtlefuse->autoload_failflag, hwinfo); 518 rtlefuse->autoload_failflag, hwinfo);
532 rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID]; 519 rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
@@ -665,7 +652,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
665 rtl_write_word(rtlpriv, REG_APS_FSMCO, value16); 652 rtl_write_word(rtlpriv, REG_APS_FSMCO, value16);
666 do { 653 do {
667 if (!(rtl_read_word(rtlpriv, REG_APS_FSMCO) & APFM_ONMAC)) { 654 if (!(rtl_read_word(rtlpriv, REG_APS_FSMCO) & APFM_ONMAC)) {
668 printk(KERN_INFO "rtl8192cu: MAC auto ON okay!\n"); 655 pr_info("MAC auto ON okay!\n");
669 break; 656 break;
670 } 657 }
671 if (pollingCount++ > 100) { 658 if (pollingCount++ > 100) {
@@ -819,7 +806,7 @@ static void _rtl92cu_init_chipN_one_out_ep_priority(struct ieee80211_hw *hw,
819 } 806 }
820 _rtl92c_init_chipN_reg_priority(hw, value, value, value, value, 807 _rtl92c_init_chipN_reg_priority(hw, value, value, value, value,
821 value, value); 808 value, value);
822 printk(KERN_INFO "rtl8192cu: Tx queue select: 0x%02x\n", queue_sel); 809 pr_info("Tx queue select: 0x%02x\n", queue_sel);
823} 810}
824 811
825static void _rtl92cu_init_chipN_two_out_ep_priority(struct ieee80211_hw *hw, 812static void _rtl92cu_init_chipN_two_out_ep_priority(struct ieee80211_hw *hw,
@@ -863,7 +850,7 @@ static void _rtl92cu_init_chipN_two_out_ep_priority(struct ieee80211_hw *hw,
863 hiQ = valueHi; 850 hiQ = valueHi;
864 } 851 }
865 _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ); 852 _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
866 printk(KERN_INFO "rtl8192cu: Tx queue select: 0x%02x\n", queue_sel); 853 pr_info("Tx queue select: 0x%02x\n", queue_sel);
867} 854}
868 855
869static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw, 856static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index a90c09b42390..194fc693c1fa 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -26,6 +26,9 @@
26 * Larry Finger <Larry.Finger@lwfinger.net> 26 * Larry Finger <Larry.Finger@lwfinger.net>
27 * 27 *
28****************************************************************************/ 28****************************************************************************/
29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
29#include <linux/module.h> 32#include <linux/module.h>
30 33
31#include "../wifi.h" 34#include "../wifi.h"
@@ -213,14 +216,14 @@ bool rtl92c_init_llt_table(struct ieee80211_hw *hw, u32 boundary)
213 for (i = 0; i < (boundary - 1); i++) { 216 for (i = 0; i < (boundary - 1); i++) {
214 rst = rtl92c_llt_write(hw, i , i + 1); 217 rst = rtl92c_llt_write(hw, i , i + 1);
215 if (true != rst) { 218 if (true != rst) {
216 printk(KERN_ERR "===> %s #1 fail\n", __func__); 219 pr_err("===> %s #1 fail\n", __func__);
217 return rst; 220 return rst;
218 } 221 }
219 } 222 }
220 /* end of list */ 223 /* end of list */
221 rst = rtl92c_llt_write(hw, (boundary - 1), 0xFF); 224 rst = rtl92c_llt_write(hw, (boundary - 1), 0xFF);
222 if (true != rst) { 225 if (true != rst) {
223 printk(KERN_ERR "===> %s #2 fail\n", __func__); 226 pr_err("===> %s #2 fail\n", __func__);
224 return rst; 227 return rst;
225 } 228 }
226 /* Make the other pages as ring buffer 229 /* Make the other pages as ring buffer
@@ -231,14 +234,14 @@ bool rtl92c_init_llt_table(struct ieee80211_hw *hw, u32 boundary)
231 for (i = boundary; i < LLT_LAST_ENTRY_OF_TX_PKT_BUFFER; i++) { 234 for (i = boundary; i < LLT_LAST_ENTRY_OF_TX_PKT_BUFFER; i++) {
232 rst = rtl92c_llt_write(hw, i, (i + 1)); 235 rst = rtl92c_llt_write(hw, i, (i + 1));
233 if (true != rst) { 236 if (true != rst) {
234 printk(KERN_ERR "===> %s #3 fail\n", __func__); 237 pr_err("===> %s #3 fail\n", __func__);
235 return rst; 238 return rst;
236 } 239 }
237 } 240 }
238 /* Let last entry point to the start entry of ring buffer */ 241 /* Let last entry point to the start entry of ring buffer */
239 rst = rtl92c_llt_write(hw, LLT_LAST_ENTRY_OF_TX_PKT_BUFFER, boundary); 242 rst = rtl92c_llt_write(hw, LLT_LAST_ENTRY_OF_TX_PKT_BUFFER, boundary);
240 if (true != rst) { 243 if (true != rst) {
241 printk(KERN_ERR "===> %s #4 fail\n", __func__); 244 pr_err("===> %s #4 fail\n", __func__);
242 return rst; 245 return rst;
243 } 246 }
244 return rst; 247 return rst;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 08837744f6f1..351765df517d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include <linux/vmalloc.h> 32#include <linux/vmalloc.h>
31 33
32#include "../wifi.h" 34#include "../wifi.h"
@@ -170,10 +172,8 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
170 } 172 }
171 173
172 if (!header_print) { 174 if (!header_print) {
173 printk(KERN_INFO "rtl8192de: Driver for Realtek RTL8192DE" 175 pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
174 " WLAN interface"); 176 pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
175 printk(KERN_INFO "rtl8192de: Loading firmware file %s\n",
176 rtlpriv->cfg->fw_name);
177 header_print++; 177 header_print++;
178 } 178 }
179 /* request fw */ 179 /* request fw */
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index fe2b0b9d9145..d59f66cb7768 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include "../wifi.h" 32#include "../wifi.h"
31#include "../efuse.h" 33#include "../efuse.h"
32#include "../base.h" 34#include "../base.h"
@@ -465,8 +467,7 @@ static u8 _rtl92ce_halset_sysclk(struct ieee80211_hw *hw, u8 data)
465 if ((tmpvalue & BIT(6))) 467 if ((tmpvalue & BIT(6)))
466 break; 468 break;
467 469
468 printk(KERN_ERR "wait for BIT(6) return value %x\n", 470 pr_err("wait for BIT(6) return value %x\n", tmpvalue);
469 tmpvalue);
470 if (waitcount == 0) 471 if (waitcount == 0)
471 break; 472 break;
472 473
@@ -1255,8 +1256,7 @@ static u8 _rtl92s_set_sysclk(struct ieee80211_hw *hw, u8 data)
1255 if ((tmp & BIT(6))) 1256 if ((tmp & BIT(6)))
1256 break; 1257 break;
1257 1258
1258 printk(KERN_ERR "wait for BIT(6) return value %x\n", 1259 pr_err("wait for BIT(6) return value %x\n", tmp);
1259 tmp);
1260 1260
1261 if (waitcnt == 0) 1261 if (waitcnt == 0)
1262 break; 1262 break;
@@ -1315,7 +1315,7 @@ static void _rtl92s_phy_set_rfhalt(struct ieee80211_hw *hw)
1315 if (u1btmp & BIT(7)) { 1315 if (u1btmp & BIT(7)) {
1316 u1btmp &= ~(BIT(6) | BIT(7)); 1316 u1btmp &= ~(BIT(6) | BIT(7));
1317 if (!_rtl92s_set_sysclk(hw, u1btmp)) { 1317 if (!_rtl92s_set_sysclk(hw, u1btmp)) {
1318 printk(KERN_ERR "Switch ctrl path fail\n"); 1318 pr_err("Switch ctrl path fail\n");
1319 return; 1319 return;
1320 } 1320 }
1321 } 1321 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 81a5aa4370cf..f27171af979c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include "../wifi.h" 32#include "../wifi.h"
31#include "../pci.h" 33#include "../pci.h"
32#include "../ps.h" 34#include "../ps.h"
@@ -1016,8 +1018,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
1016 rtstatus = _rtl92s_phy_config_bb(hw, BASEBAND_CONFIG_AGC_TAB); 1018 rtstatus = _rtl92s_phy_config_bb(hw, BASEBAND_CONFIG_AGC_TAB);
1017 1019
1018 if (rtstatus != true) { 1020 if (rtstatus != true) {
1019 printk(KERN_ERR "_rtl92s_phy_bb_config_parafile(): " 1021 pr_err("%s(): AGC Table Fail\n", __func__);
1020 "AGC Table Fail\n");
1021 goto phy_BB8190_Config_ParaFile_Fail; 1022 goto phy_BB8190_Config_ParaFile_Fail;
1022 } 1023 }
1023 1024
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
index c6e3a4ca42f9..0ad50fe44aa2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include "../wifi.h" 32#include "../wifi.h"
31#include "reg.h" 33#include "reg.h"
32#include "def.h" 34#include "def.h"
@@ -507,7 +509,7 @@ bool rtl92s_phy_rf6052_config(struct ieee80211_hw *hw)
507 } 509 }
508 510
509 if (rtstatus != true) { 511 if (rtstatus != true) {
510 printk(KERN_ERR "Radio[%d] Fail!!", rfpath); 512 pr_err("Radio[%d] Fail!!\n", rfpath);
511 goto fail; 513 goto fail;
512 } 514 }
513 515
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 1c6cb1d7d660..3876078a63de 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -27,6 +27,8 @@
27 * 27 *
28 *****************************************************************************/ 28 *****************************************************************************/
29 29
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include <linux/vmalloc.h> 32#include <linux/vmalloc.h>
31 33
32#include "../wifi.h" 34#include "../wifi.h"
@@ -183,8 +185,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
183 return 1; 185 return 1;
184 } 186 }
185 187
186 printk(KERN_INFO "rtl8192se: Driver for Realtek RTL8192SE/RTL8191SE\n" 188 pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
187 " Loading firmware %s\n", rtlpriv->cfg->fw_name); 189 "Loading firmware %s\n", rtlpriv->cfg->fw_name);
188 /* request fw */ 190 /* request fw */
189 err = request_firmware(&firmware, rtlpriv->cfg->fw_name, 191 err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
190 rtlpriv->io.dev); 192 rtlpriv->io.dev);
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index a9367eba1ea7..8b1cef0ffde6 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -24,6 +24,9 @@
24 * Hsinchu 300, Taiwan. 24 * Hsinchu 300, Taiwan.
25 * 25 *
26 *****************************************************************************/ 26 *****************************************************************************/
27
28#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
29
27#include <linux/usb.h> 30#include <linux/usb.h>
28#include "core.h" 31#include "core.h"
29#include "wifi.h" 32#include "wifi.h"
@@ -104,9 +107,8 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
104 pdata, len, 0); /* max. timeout */ 107 pdata, len, 0); /* max. timeout */
105 108
106 if (status < 0) 109 if (status < 0)
107 printk(KERN_ERR "reg 0x%x, usbctrl_vendorreq TimeOut! " 110 pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",
108 "status:0x%x value=0x%x\n", value, status, 111 value, status, *(u32 *)pdata);
109 *(u32 *)pdata);
110 return status; 112 return status;
111} 113}
112 114
@@ -316,7 +318,7 @@ static int _rtl_usb_init_rx(struct ieee80211_hw *hw)
316 rtlusb->usb_rx_segregate_hdl = 318 rtlusb->usb_rx_segregate_hdl =
317 rtlpriv->cfg->usb_interface_cfg->usb_rx_segregate_hdl; 319 rtlpriv->cfg->usb_interface_cfg->usb_rx_segregate_hdl;
318 320
319 printk(KERN_INFO "rtl8192cu: rx_max_size %d, rx_urb_num %d, in_ep %d\n", 321 pr_info("rx_max_size %d, rx_urb_num %d, in_ep %d\n",
320 rtlusb->rx_max_size, rtlusb->rx_urb_num, rtlusb->in_ep); 322 rtlusb->rx_max_size, rtlusb->rx_urb_num, rtlusb->in_ep);
321 init_usb_anchor(&rtlusb->rx_submitted); 323 init_usb_anchor(&rtlusb->rx_submitted);
322 return 0; 324 return 0;
@@ -580,7 +582,7 @@ static void _rtl_rx_completed(struct urb *_urb)
580 } else{ 582 } else{
581 /* TO DO */ 583 /* TO DO */
582 _rtl_rx_pre_process(hw, skb); 584 _rtl_rx_pre_process(hw, skb);
583 printk(KERN_ERR "rtlwifi: rx agg not supported\n"); 585 pr_err("rx agg not supported\n");
584 } 586 }
585 goto resubmit; 587 goto resubmit;
586 } 588 }