staging: rtl8192e: Rename IPSEnter

Use naming schema found in other rtlwifi devices.
Rename IPSEnter to rtl92e_ips_enter.

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 c1af8adda20c450e0cf6bebb3cdcc0ff02b6b24d..34b1db2b2217115876c555ad453b4d65f085a6dc 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1449,8 +1449,8 @@ static void rtl819x_watchdog_wqcallback(void *data)
                             IPS_CALLBACK_NONE) &&
                             (!ieee->bNetPromiscuousMode)) {
                                RT_TRACE(COMP_PS,
-                                        "====================>haha: IPSEnter()\n");
-                               IPSEnter(dev);
+                                        "====================>haha: rtl92e_ips_enter()\n");
+                               rtl92e_ips_enter(dev);
                        }
                }
        }

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index fc4503f2a82eef4eafbb110f2fec8f8504612a7d..5b0dbe76ea786023d3597088e71a7d37cbea38e3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -140,7 +140,7 @@ static void InactivePsWorkItemCallback(struct net_device *dev)
        RT_TRACE(COMP_PS, "InactivePsWorkItemCallback() <---------\n");
 }
 
-void IPSEnter(struct net_device *dev)
+void rtl92e_ips_enter(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
@@ -152,7 +152,7 @@ void IPSEnter(struct net_device *dev)
                if (rtState == eRfOn && !pPSC->bSwRfProcessing &&
                        (priv->rtllib->state != RTLLIB_LINKED) &&
                        (priv->rtllib->iw_mode != IW_MODE_MASTER)) {
-                       RT_TRACE(COMP_PS, "IPSEnter(): Turn off RF.\n");
+                       RT_TRACE(COMP_PS, "rtl92e_ips_enter(): Turn off RF.\n");
                        pPSC->eInactivePowerState = eRfOff;
                        priv->isRFOff = true;
                        priv->bInPowerSaveMode = true;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
index d23c0f1d76f57df374935317a64f9b279e4cd73d..e29c57f53a186a7161099a8b769ea61a55d52984 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
@@ -37,7 +37,7 @@ void rtllib_ips_leave_wq(struct net_device *dev);
 void rtllib_ips_leave(struct net_device *dev);
 void IPSLeave_wq(void *data);
 
-void IPSEnter(struct net_device *dev);
+void rtl92e_ips_enter(struct net_device *dev);
 void IPSLeave(struct net_device *dev);
 
 void LeisurePSEnter(struct net_device *dev);