xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtlwifi: Convert printks to pr_<level>

Browse Source 
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>
This commit is contained in:
Joe Perches
2011-07-20 08:51:35 -07:00
committed by John W. Linville
parent 6054069a03
commit 292b11926f
11 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
View File

@@ -27,6 +27,8 @@
*
*****************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "../wifi.h"
#include "../efuse.h"
#include "../base.h"
@@ -337,7 +339,7 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
rtlefuse->board_type = boardType;
if (IS_HIGHT_PA(rtlefuse->board_type))
rtlefuse->external_pa = 1;
printk(KERN_INFO "rtl8192cu: Board Type %x\n", rtlefuse->board_type);
pr_info("Board Type %x\n", rtlefuse->board_type);
#ifdef CONFIG_ANTENNA_DIVERSITY
/* Antenna Diversity setting. */
@@ -346,8 +348,7 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
else
rtl_efuse->antenna_cfg = registry_par->antdiv_cfg; /* 0:OFF, */
printk(KERN_INFO "rtl8192cu: Antenna Config %x\n",
rtl_efuse->antenna_cfg);
pr_info("Antenna Config %x\n", rtl_efuse->antenna_cfg);
#endif
}
@@ -384,71 +385,57 @@ static void _update_bt_param(_adapter *padapter)
pbtpriv->bBTNonTrafficModeSet = _FALSE;
pbtpriv->CurrentState = 0;
pbtpriv->PreviousState = 0;
printk(KERN_INFO "rtl8192cu: BT Coexistance = %s\n",
(pbtpriv->BT_Coexist == _TRUE) ? "enable" : "disable");
pr_info("BT Coexistance = %s\n",
(pbtpriv->BT_Coexist == _TRUE) ? "enable" : "disable");
if (pbtpriv->BT_Coexist) {
if (pbtpriv->BT_Ant_Num == Ant_x2)
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"Ant_Num = Antx2\n");
pr_info("BlueTooth BT_Ant_Num = Antx2\n");
else if (pbtpriv->BT_Ant_Num == Ant_x1)
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"Ant_Num = Antx1\n");
pr_info("BlueTooth BT_Ant_Num = Antx1\n");
switch (pbtpriv->BT_CoexistType) {
case BT_2Wire:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = BT_2Wire\n");
pr_info("BlueTooth BT_CoexistType = BT_2Wire\n");
break;
case BT_ISSC_3Wire:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = BT_ISSC_3Wire\n");
pr_info("BlueTooth BT_CoexistType = BT_ISSC_3Wire\n");
break;
case BT_Accel:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = BT_Accel\n");
pr_info("BlueTooth BT_CoexistType = BT_Accel\n");
break;
case BT_CSR_BC4:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = BT_CSR_BC4\n");
pr_info("BlueTooth BT_CoexistType = BT_CSR_BC4\n");
break;
case BT_CSR_BC8:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = BT_CSR_BC8\n");
pr_info("BlueTooth BT_CoexistType = BT_CSR_BC8\n");
break;
case BT_RTL8756:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = BT_RTL8756\n");
pr_info("BlueTooth BT_CoexistType = BT_RTL8756\n");
break;
default:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_"
"CoexistType = Unknown\n");
pr_info("BlueTooth BT_CoexistType = Unknown\n");
break;
}
printk(KERN_INFO "rtl8192cu: BlueTooth BT_Ant_isolation = %d\n",
pbtpriv->BT_Ant_isolation);
pr_info("BlueTooth BT_Ant_isolation = %d\n",
pbtpriv->BT_Ant_isolation);
switch (pbtpriv->BT_Service) {
case BT_OtherAction:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = "
"BT_OtherAction\n");
pr_info("BlueTooth BT_Service = BT_OtherAction\n");
break;
case BT_SCO:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = "
"BT_SCO\n");
pr_info("BlueTooth BT_Service = BT_SCO\n");
break;
case BT_Busy:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = "
"BT_Busy\n");
pr_info("BlueTooth BT_Service = BT_Busy\n");
break;
case BT_OtherBusy:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = "
"BT_OtherBusy\n");
pr_info("BlueTooth BT_Service = BT_OtherBusy\n");
break;
default:
printk(KERN_INFO "rtl8192cu: BlueTooth BT_Service = "
"BT_Idle\n");
pr_info("BlueTooth BT_Service = BT_Idle\n");
break;
}
printk(KERN_INFO "rtl8192cu: BT_RadioSharedType = 0x%x\n",
pbtpriv->BT_RadioSharedType);
pr_info("BT_RadioSharedType = 0x%x\n",
pbtpriv->BT_RadioSharedType);
}
}
@@ -526,7 +513,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
*((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
}
printk(KERN_INFO "rtl8192cu: MAC address: %pM\n", rtlefuse->dev_addr);
pr_info("MAC address: %pM\n", rtlefuse->dev_addr);
_rtl92cu_read_txpower_info_from_hwpg(hw,
rtlefuse->autoload_failflag, hwinfo);
rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
@@ -665,7 +652,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
rtl_write_word(rtlpriv, REG_APS_FSMCO, value16);
do {
if (!(rtl_read_word(rtlpriv, REG_APS_FSMCO) & APFM_ONMAC)) {
printk(KERN_INFO "rtl8192cu: MAC auto ON okay!\n");
pr_info("MAC auto ON okay!\n");
break;
}
if (pollingCount++ > 100) {
@@ -819,7 +806,7 @@ static void _rtl92cu_init_chipN_one_out_ep_priority(struct ieee80211_hw *hw,
}
_rtl92c_init_chipN_reg_priority(hw, value, value, value, value,
value, value);
printk(KERN_INFO "rtl8192cu: Tx queue select: 0x%02x\n", queue_sel);
pr_info("Tx queue select: 0x%02x\n", queue_sel);
}
static 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,
hiQ = valueHi;
}
_rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
printk(KERN_INFO "rtl8192cu: Tx queue select: 0x%02x\n", queue_sel);
pr_info("Tx queue select: 0x%02x\n", queue_sel);
}
static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw,