staging: rtl8192e: Rename IPSLeave

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>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 749b5ce..dc8c7a8 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -108,7 +108,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
                                return;
                        }
                        down(&priv->rtllib->ips_sem);
-                       IPSLeave(dev);
+                       rtl92e_ips_leave(dev);
                        up(&priv->rtllib->ips_sem);
                }
        }

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 5b0dbe7..bf93bf8 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -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 rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
@@ -172,7 +172,7 @@ void IPSLeave(struct net_device *dev)
                rtState = priv->rtllib->eRFPowerState;
                if (rtState != eRfOn  && !pPSC->bSwRfProcessing &&
                    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;
                        priv->bInPowerSaveMode = false;
                        InactivePsWorkItemCallback(dev);
@@ -188,7 +188,7 @@ void IPSLeave_wq(void *data)
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
        down(&priv->rtllib->ips_sem);
-       IPSLeave(dev);
+       rtl92e_ips_leave(dev);
        up(&priv->rtllib->ips_sem);
 }
 
@@ -206,7 +206,7 @@ void rtllib_ips_leave_wq(struct net_device *dev)
                                            __func__);
                                return;
                        }
-                       netdev_info(dev, "=========>%s(): IPSLeave\n",
+                       netdev_info(dev, "=========>%s(): rtl92e_ips_leave\n",
                                    __func__);
                        queue_work_rsl(priv->rtllib->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);
 
        down(&priv->rtllib->ips_sem);
-       IPSLeave(dev);
+       rtl92e_ips_leave(dev);
        up(&priv->rtllib->ips_sem);
 }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
index e29c57f..b1b480f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
@@ -38,7 +38,7 @@ void rtllib_ips_leave(struct net_device *dev);
 void IPSLeave_wq(void *data);
 
 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 LeisurePSLeave(struct net_device *dev);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index ebed99b..dc2d7ec 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -282,10 +282,11 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
                                        up(&priv->wx_sem);
                                        return -1;
                                }
-                               netdev_info(dev,  "=========>%s(): IPSLeave\n",
+                               netdev_info(dev,
+                                           "=========>%s(): rtl92e_ips_leave\n",
                                            __func__);
                                down(&priv->rtllib->ips_sem);
-                               IPSLeave(dev);
+                               rtl92e_ips_leave(dev);
                                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);
                                        return -1;
                                }
-                               RT_TRACE(COMP_PS, "=========>%s(): IPSLeave\n",
+                               RT_TRACE(COMP_PS,
+                                        "=========>%s(): rtl92e_ips_leave\n",
                                         __func__);
                                down(&priv->rtllib->ips_sem);
-                               IPSLeave(dev);
+                               rtl92e_ips_leave(dev);
                                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;
        down(&priv->rtllib->ips_sem);
-       IPSLeave(dev);
+       rtl92e_ips_leave(dev);
        up(&priv->rtllib->ips_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;
        down(&priv->rtllib->ips_sem);
-       IPSLeave(dev);
+       rtl92e_ips_leave(dev);
        up(&priv->rtllib->ips_sem);
 
        ret = rtllib_wx_set_encode_ext(ieee, info, wrqu, extra);