staging: rtl8192e: Rename LeisurePSLeave

Use naming schema found in other rtlwifi devices.
Rename LeisurePSLeave to rtl92e_leisure_ps_leave.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index bf41950..f5dcd02 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -811,7 +811,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
                priv->rtllib->rtllib_ips_leave(dev);
 
        if (priv->rtllib->state == RTLLIB_LINKED)
-               LeisurePSLeave(dev);
+               rtl92e_leisure_ps_leave(dev);
 
        priv->bDriverIsGoingToUnload = true;
        priv->up = 0;
@@ -875,7 +875,7 @@ static void rtl8192_init_priv_handler(struct net_device *dev)
        priv->rtllib->handle_assoc_response     = rtl8192_handle_assoc_response;
        priv->rtllib->handle_beacon             = rtl8192_handle_beacon;
        priv->rtllib->SetWirelessMode           = rtl92e_set_wireless_mode;
-       priv->rtllib->LeisurePSLeave            = LeisurePSLeave;
+       priv->rtllib->LeisurePSLeave            = rtl92e_leisure_ps_leave;
        priv->rtllib->SetBWModeHandler          = rtl92e_set_bw_mode;
        priv->rf_set_chan                       = rtl92e_set_channel;
 
@@ -1282,7 +1282,7 @@ RESET_START:
                down(&priv->wx_sem);
 
                if (priv->rtllib->state == RTLLIB_LINKED)
-                       LeisurePSLeave(dev);
+                       rtl92e_leisure_ps_leave(dev);
 
                if (priv->up) {
                        netdev_info(dev, "%s():the driver is not up.\n",
@@ -1484,11 +1484,11 @@ static void rtl819x_watchdog_wqcallback(void *data)
                if (bEnterPS)
                        rtl92e_leisure_ps_enter(dev);
                else
-                       LeisurePSLeave(dev);
+                       rtl92e_leisure_ps_leave(dev);
 
        } else {
                RT_TRACE(COMP_LPS, "====>no link LPS leave\n");
-               LeisurePSLeave(dev);
+               rtl92e_leisure_ps_leave(dev);
        }
 
        ieee->LinkDetectInfo.NumRxOkInPeriod = 0;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 232e4fa..cd117f5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -291,21 +291,21 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
        }
 }
 
-void LeisurePSLeave(struct net_device *dev)
+void rtl92e_leisure_ps_leave(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
                                        &(priv->rtllib->PowerSaveControl);
 
 
-       RT_TRACE(COMP_PS, "LeisurePSLeave()...\n");
+       RT_TRACE(COMP_PS, "rtl92e_leisure_ps_leave()...\n");
        RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d\n",
                pPSC->bLeisurePs, priv->rtllib->ps);
 
        if (pPSC->bLeisurePs) {
                if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {
                        RT_TRACE(COMP_LPS,
-                                "LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n");
+                                "rtl92e_leisure_ps_leave(): Busy Traffic , Leave 802.11 power save..\n");
                        MgntActSet_802_11_PowerSaveMode(dev,
                                         RTLLIB_PS_DISABLED);
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
index dd4ca28..250d524 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
@@ -41,6 +41,6 @@ void rtl92e_ips_enter(struct net_device *dev);
 void rtl92e_ips_leave(struct net_device *dev);
 
 void rtl92e_leisure_ps_enter(struct net_device *dev);
-void LeisurePSLeave(struct net_device *dev);
+void rtl92e_leisure_ps_leave(struct net_device *dev);
 
 #endif

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index dc2d7ec..183d1b2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -192,7 +192,7 @@ static int r8192_wx_adapter_power_status(struct net_device *dev,
                pPSC->bLeisurePs = true;
        } else {
                if (priv->rtllib->state == RTLLIB_LINKED)
-                       LeisurePSLeave(dev);
+                       rtl92e_leisure_ps_leave(dev);
 
                priv->ps_force = true;
                pPSC->bLeisurePs = false;