Commit 2536f0c6 authored by Suniel Mahesh's avatar Suniel Mahesh Committed by Greg Kroah-Hartman

staging: rtl8192e: Fix embedded function names with __func__

Prefer and make it generic by using %s and __func__ to print
functions name instead of embedding functions name in print statements
Signed-off-by: default avatarSuniel Mahesh <suniel.spartan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c615f3a
...@@ -35,7 +35,7 @@ static void _rtl92e_hw_sleep(struct net_device *dev) ...@@ -35,7 +35,7 @@ static void _rtl92e_hw_sleep(struct net_device *dev)
if (priv->RFChangeInProgress) { if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
RT_TRACE(COMP_DBG, RT_TRACE(COMP_DBG,
"_rtl92e_hw_sleep(): RF Change in progress!\n"); "%s(): RF Change in progress!\n", __func__);
return; return;
} }
spin_unlock_irqrestore(&priv->rf_ps_lock, flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
...@@ -62,7 +62,7 @@ void rtl92e_hw_wakeup(struct net_device *dev) ...@@ -62,7 +62,7 @@ void rtl92e_hw_wakeup(struct net_device *dev)
if (priv->RFChangeInProgress) { if (priv->RFChangeInProgress) {
spin_unlock_irqrestore(&priv->rf_ps_lock, flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
RT_TRACE(COMP_DBG, RT_TRACE(COMP_DBG,
"rtl92e_hw_wakeup(): RF Change in progress!\n"); "%s(): RF Change in progress!\n", __func__);
schedule_delayed_work(&priv->rtllib->hw_wakeup_wq, schedule_delayed_work(&priv->rtllib->hw_wakeup_wq,
msecs_to_jiffies(10)); msecs_to_jiffies(10));
return; return;
...@@ -121,15 +121,15 @@ static void _rtl92e_ps_update_rf_state(struct net_device *dev) ...@@ -121,15 +121,15 @@ static void _rtl92e_ps_update_rf_state(struct net_device *dev)
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
&(priv->rtllib->PowerSaveControl); &(priv->rtllib->PowerSaveControl);
RT_TRACE(COMP_PS, "_rtl92e_ps_update_rf_state() --------->\n"); RT_TRACE(COMP_PS, "%s() --------->\n", __func__);
pPSC->bSwRfProcessing = true; pPSC->bSwRfProcessing = true;
RT_TRACE(COMP_PS, "_rtl92e_ps_update_rf_state(): Set RF to %s.\n", RT_TRACE(COMP_PS, "%s(): Set RF to %s.\n", __func__,
pPSC->eInactivePowerState == eRfOff ? "OFF" : "ON"); pPSC->eInactivePowerState == eRfOff ? "OFF" : "ON");
rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS); rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS);
pPSC->bSwRfProcessing = false; pPSC->bSwRfProcessing = false;
RT_TRACE(COMP_PS, "_rtl92e_ps_update_rf_state() <---------\n"); RT_TRACE(COMP_PS, "%s() <---------\n", __func__);
} }
void rtl92e_ips_enter(struct net_device *dev) void rtl92e_ips_enter(struct net_device *dev)
...@@ -144,7 +144,7 @@ void rtl92e_ips_enter(struct net_device *dev) ...@@ -144,7 +144,7 @@ void rtl92e_ips_enter(struct net_device *dev)
if (rtState == eRfOn && !pPSC->bSwRfProcessing && if (rtState == eRfOn && !pPSC->bSwRfProcessing &&
(priv->rtllib->state != RTLLIB_LINKED) && (priv->rtllib->state != RTLLIB_LINKED) &&
(priv->rtllib->iw_mode != IW_MODE_MASTER)) { (priv->rtllib->iw_mode != IW_MODE_MASTER)) {
RT_TRACE(COMP_PS, "rtl92e_ips_enter(): Turn off RF.\n"); RT_TRACE(COMP_PS, "%s(): Turn off RF.\n", __func__);
pPSC->eInactivePowerState = eRfOff; pPSC->eInactivePowerState = eRfOff;
priv->isRFOff = true; priv->isRFOff = true;
priv->bInPowerSaveMode = true; priv->bInPowerSaveMode = true;
...@@ -164,7 +164,7 @@ void rtl92e_ips_leave(struct net_device *dev) ...@@ -164,7 +164,7 @@ void rtl92e_ips_leave(struct net_device *dev)
rtState = priv->rtllib->eRFPowerState; rtState = priv->rtllib->eRFPowerState;
if (rtState != eRfOn && !pPSC->bSwRfProcessing && if (rtState != eRfOn && !pPSC->bSwRfProcessing &&
priv->rtllib->RfOffReason <= RF_CHANGE_BY_IPS) { priv->rtllib->RfOffReason <= RF_CHANGE_BY_IPS) {
RT_TRACE(COMP_PS, "rtl92e_ips_leave(): Turn on RF.\n"); RT_TRACE(COMP_PS, "%s(): Turn on RF.\n", __func__);
pPSC->eInactivePowerState = eRfOn; pPSC->eInactivePowerState = eRfOn;
priv->bInPowerSaveMode = false; priv->bInPowerSaveMode = false;
_rtl92e_ps_update_rf_state(dev); _rtl92e_ps_update_rf_state(dev);
...@@ -247,7 +247,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) ...@@ -247,7 +247,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
&(priv->rtllib->PowerSaveControl); &(priv->rtllib->PowerSaveControl);
RT_TRACE(COMP_PS, "rtl92e_leisure_ps_enter()...\n"); RT_TRACE(COMP_PS, "%s()...\n", __func__);
RT_TRACE(COMP_PS, RT_TRACE(COMP_PS,
"pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdleCount is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n", "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdleCount is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n",
pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount, pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount,
...@@ -265,7 +265,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) ...@@ -265,7 +265,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
if (priv->rtllib->ps == RTLLIB_PS_DISABLED) { if (priv->rtllib->ps == RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, RT_TRACE(COMP_LPS,
"rtl92e_leisure_ps_enter(): Enter 802.11 power save mode...\n"); "%s(): Enter 802.11 power save mode...\n", __func__);
if (!pPSC->bFwCtrlLPS) { if (!pPSC->bFwCtrlLPS) {
if (priv->rtllib->SetFwCmdHandler) if (priv->rtllib->SetFwCmdHandler)
...@@ -287,14 +287,14 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) ...@@ -287,14 +287,14 @@ void rtl92e_leisure_ps_leave(struct net_device *dev)
&(priv->rtllib->PowerSaveControl); &(priv->rtllib->PowerSaveControl);
RT_TRACE(COMP_PS, "rtl92e_leisure_ps_leave()...\n"); RT_TRACE(COMP_PS, "%s()...\n", __func__);
RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d\n", RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d\n",
pPSC->bLeisurePs, priv->rtllib->ps); pPSC->bLeisurePs, priv->rtllib->ps);
if (pPSC->bLeisurePs) { if (pPSC->bLeisurePs) {
if (priv->rtllib->ps != RTLLIB_PS_DISABLED) { if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {
RT_TRACE(COMP_LPS, RT_TRACE(COMP_LPS,
"rtl92e_leisure_ps_leave(): Busy Traffic , Leave 802.11 power save..\n"); "%s(): Busy Traffic , Leave 802.11 power save..\n", __func__);
_rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED); _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED);
if (!pPSC->bFwCtrlLPS) { if (!pPSC->bFwCtrlLPS) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment