evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8192e: Rename IPSLeave

Browse source 
Use naming schema found in other rtlwifi devices.
Rename IPSLeave to rtl92e_ips_leave.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-07-19 19:33:47 +02:00 • committed by Greg Kroah-Hartman
parent 410d6fc983
commit 2ab2aba29e
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
View file

@ -108,7 +108,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
return; return;
} }
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
} }
} }

10
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
View file

@ -161,7 +161,7 @@ void rtl92e_ips_enter(struct net_device *dev)
} }
} }
void IPSLeave(struct net_device *dev) void rtl92e_ips_leave(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
@ -172,7 +172,7 @@ void IPSLeave(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, "IPSLeave(): Turn on RF.\n"); RT_TRACE(COMP_PS, "rtl92e_ips_leave(): Turn on RF.\n");
pPSC->eInactivePowerState = eRfOn; pPSC->eInactivePowerState = eRfOn;
priv->bInPowerSaveMode = false; priv->bInPowerSaveMode = false;
InactivePsWorkItemCallback(dev); InactivePsWorkItemCallback(dev);
@ -188,7 +188,7 @@ void IPSLeave_wq(void *data)
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
} }
@ -206,7 +206,7 @@ void rtllib_ips_leave_wq(struct net_device *dev)
__func__); __func__);
return; return;
} }
netdev_info(dev, "=========>%s(): IPSLeave\n", netdev_info(dev, "=========>%s(): rtl92e_ips_leave\n",
__func__); __func__);
queue_work_rsl(priv->rtllib->wq, queue_work_rsl(priv->rtllib->wq,
&priv->rtllib->ips_leave_wq); &priv->rtllib->ips_leave_wq);
@ -219,7 +219,7 @@ void rtllib_ips_leave(struct net_device *dev)
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
} }

2
drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
View file

@ -38,7 +38,7 @@ void rtllib_ips_leave(struct net_device *dev);
void IPSLeave_wq(void *data); void IPSLeave_wq(void *data);
void rtl92e_ips_enter(struct net_device *dev); void rtl92e_ips_enter(struct net_device *dev);
void IPSLeave(struct net_device *dev); void rtl92e_ips_leave(struct net_device *dev);
void LeisurePSEnter(struct net_device *dev); void LeisurePSEnter(struct net_device *dev);
void LeisurePSLeave(struct net_device *dev); void LeisurePSLeave(struct net_device *dev);

14
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
View file

@ -282,10 +282,11 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
up(&priv->wx_sem); up(&priv->wx_sem);
return -1; return -1;
} }
netdev_info(dev, "=========>%s(): IPSLeave\n", netdev_info(dev,
"=========>%s(): rtl92e_ips_leave\n",
__func__); __func__);
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
} }
} }
@ -442,10 +443,11 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
up(&priv->wx_sem); up(&priv->wx_sem);
return -1; return -1;
} }
RT_TRACE(COMP_PS, "=========>%s(): IPSLeave\n", RT_TRACE(COMP_PS,
"=========>%s(): rtl92e_ips_leave\n",
__func__); __func__);
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
} }
} }
@ -700,7 +702,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
priv->rtllib->wx_set_enc = 1; priv->rtllib->wx_set_enc = 1;
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
down(&priv->wx_sem); down(&priv->wx_sem);
@ -910,7 +912,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
priv->rtllib->wx_set_enc = 1; priv->rtllib->wx_set_enc = 1;
down(&priv->rtllib->ips_sem); down(&priv->rtllib->ips_sem);
IPSLeave(dev); rtl92e_ips_leave(dev);
up(&priv->rtllib->ips_sem); up(&priv->rtllib->ips_sem);
ret = rtllib_wx_set_encode_ext(ieee, info, wrqu, extra); ret = rtllib_wx_set_encode_ext(ieee, info, wrqu, extra);