staging: vt6655: rf.c/h Replace DeviceContext with vnt_private

Removing void and including device.h for power.h

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

diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index e58afbd8c89eb6f7edaabf0213ea8564220c3dd2..ad44746d4ff473749f888971b67d855bd8185159 100644 (file)
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -64,11 +64,10 @@
 
 void
 PSvEnablePowerSaving(
-       void *hDeviceContext,
+       struct vnt_private *priv,
        unsigned short wListenInterval
 )
 {
-       struct vnt_private *priv = hDeviceContext;
        u16 wAID = priv->current_aid | BIT(14) | BIT(15);
 
        /* set period of power up before TBTT */
@@ -117,11 +116,9 @@ PSvEnablePowerSaving(
 
 void
 PSvDisablePowerSaving(
-       void *hDeviceContext
+       struct vnt_private *priv
 )
 {
-       struct vnt_private *priv = hDeviceContext;
-
        /* disable power saving hw function */
        MACbPSWakeup(priv->PortOffset);
        /* clear AutoSleep */
@@ -149,10 +146,9 @@ PSvDisablePowerSaving(
 
 bool
 PSbIsNextTBTTWakeUp(
-       void *hDeviceContext
+       struct vnt_private *priv
 )
 {
-       struct vnt_private *priv = hDeviceContext;
        struct ieee80211_hw *hw = priv->hw;
        struct ieee80211_conf *conf = &hw->conf;
        bool bWakeUp = false;

diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h
index 538e68507bb0a40732e4074f5fef009751ec2c7c..d82dd8d6d68ba67d703a317b83f45bee5cd9b524 100644 (file)
--- a/drivers/staging/vt6655/power.h
+++ b/drivers/staging/vt6655/power.h
@@ -29,25 +29,27 @@
 #ifndef __POWER_H__
 #define __POWER_H__
 
+#include "device.h"
+
 #define C_PWBT                   1000    /* micro sec. power up before TBTT */
 #define PS_FAST_INTERVAL         1       /* Fast power saving listen interval */
 #define PS_MAX_INTERVAL          4       /* MAX power saving listen interval */
 
 void
 PSvDisablePowerSaving(
-       void *hDeviceContext
+       struct vnt_private *
 );
 
 void
 PSvEnablePowerSaving(
-       void *hDeviceContext,
+       struct vnt_private *,
        unsigned short wListenInterval
 );
 
 
 bool
 PSbIsNextTBTTWakeUp(
-       void *hDeviceContext
+       struct vnt_private *
 );
 
 #endif /* __POWER_H__ */