From 905dba5cbd669bc9113560565dbfa18007b949ff Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Wed, 4 Jun 2014 18:25:25 +0100
Subject: [PATCH] staging: vt6656: rename PSvDisablePowerSaving to
vnt_disable_power_saving
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/vt6656/iwctl.c | 2 +-
drivers/staging/vt6656/power.c | 2 +-
drivers/staging/vt6656/power.h | 2 +-
drivers/staging/vt6656/wcmd.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 73b779421052a..3e144ed963633 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -1323,7 +1323,7 @@ int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info,
if (wrq->disabled) {
pDevice->ePSMode = WMAC_POWER_CAM;
- PSvDisablePowerSaving(pDevice);
+ vnt_disable_power_saving(pDevice);
return rc;
}
if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index ae136b2c0e57e..e5462ed1a4d40 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -125,7 +125,7 @@ void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval)
*
*/
-void PSvDisablePowerSaving(struct vnt_private *priv)
+void vnt_disable_power_saving(struct vnt_private *priv)
{
/* disable power saving hw function */
diff --git a/drivers/staging/vt6656/power.h b/drivers/staging/vt6656/power.h
index 0642f188cc8c9..ef669b70970d8 100644
--- a/drivers/staging/vt6656/power.h
+++ b/drivers/staging/vt6656/power.h
@@ -38,7 +38,7 @@
int PSbConsiderPowerDown(struct vnt_private *, int bCheckRxDMA,
int bCheckCountToWakeUp);
-void PSvDisablePowerSaving(struct vnt_private *);
+void vnt_disable_power_saving(struct vnt_private *);
void vnt_enable_power_saving(struct vnt_private *, u16);
void PSvSendPSPOLL(struct vnt_private *);
int PSbSendNullPacket(struct vnt_private *);
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 55c55634e61b6..b2d7865a6f759 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -480,7 +480,7 @@ void vRunCommand(struct work_struct *work)
// set initial state
pMgmt->eCurrState = WMAC_STATE_IDLE;
pMgmt->eCurrMode = WMAC_MODE_STANDBY;
- PSvDisablePowerSaving((void *) pDevice);
+ vnt_disable_power_saving(pDevice);
BSSvClearNodeDBTable(pDevice, 0);
vMgrJoinBSSBegin((void *) pDevice, &Status);
// if Infra mode
--
2.30.2