staging: vt6656: rename PSvEnablePowerSaving to vnt_enable_power_saving

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index b45af4acb18342178e059196e5ae5143ce0c785a..73b779421052aa5bf2c254274554334809241ebc 100644 (file)
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -1328,11 +1328,11 @@ int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info,
        }
        if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
                pDevice->ePSMode = WMAC_POWER_FAST;
-               PSvEnablePowerSaving((void *)pDevice, pMgmt->wListenInterval);
+               vnt_enable_power_saving(pDevice, pMgmt->wListenInterval);
 
        } else if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_PERIOD) {
                pDevice->ePSMode = WMAC_POWER_FAST;
-               PSvEnablePowerSaving((void *)pDevice, pMgmt->wListenInterval);
+               vnt_enable_power_saving(pDevice, pMgmt->wListenInterval);
        }
 
        switch (wrq->flags & IW_POWER_MODE) {

diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index 7f603724ee9ec13a61e18625a3d9b8ec48baf551..ae136b2c0e57e9a6c246f66c77e1352af0376de7 100644 (file)
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -26,7 +26,7 @@
  * Date: July 17, 2002
  *
  * Functions:
- *      PSvEnablePowerSaving - Enable Power Saving Mode
+ *      vnt_enable_power_saving - Enable Power Saving Mode
  *      PSvDiasblePowerSaving - Disable Power Saving Mode
  *      PSbConsiderPowerDown - Decide if we can Power Down
  *      PSvSendPSPOLL - Send PS-POLL packet
@@ -58,7 +58,7 @@ static int msglevel = MSG_LEVEL_INFO;
  *
  */
 
-void PSvEnablePowerSaving(struct vnt_private *priv, u16 listen_interval)
+void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval)
 {
        struct vnt_manager *mgmt = &priv->vnt_mgmt;
        u16 aid = mgmt->wCurrAID | BIT14 | BIT15;

diff --git a/drivers/staging/vt6656/power.h b/drivers/staging/vt6656/power.h
index 77835823943764e01ac909ecfffb72287d23ffb5..0642f188cc8c98135b03c78e2834326c1ca22051 100644 (file)
--- a/drivers/staging/vt6656/power.h
+++ b/drivers/staging/vt6656/power.h
@@ -39,7 +39,7 @@
 int PSbConsiderPowerDown(struct vnt_private *, int bCheckRxDMA,
        int bCheckCountToWakeUp);
 void PSvDisablePowerSaving(struct vnt_private *);
-void PSvEnablePowerSaving(struct vnt_private *, u16 wListenInterval);
+void vnt_enable_power_saving(struct vnt_private *, u16);
 void PSvSendPSPOLL(struct vnt_private *);
 int PSbSendNullPacket(struct vnt_private *);
 int PSbIsNextTBTTWakeUp(struct vnt_private *);

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index ae773a6bb3de6aea4733cde43d35f5088324e2cc..55c55634e61b6bdca26582771348e85a8e01ddae 100644 (file)
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -593,7 +593,7 @@ void vRunCommand(struct work_struct *work)
                if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n");
                        if (pDevice->ePSMode != WMAC_POWER_CAM) {
-                               PSvEnablePowerSaving((void *) pDevice,
+                               vnt_enable_power_saving(pDevice,
                                                pMgmt->wListenInterval);
                        }
 /*