Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / staging / vt6656 / power.c

diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index 43da58927cd2560c6a9c0d018a7c10eb4dfdb197..ddbd04695c9970d76755b9c939e68b71dbf68cd0 100644 (file)
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -44,8 +44,7 @@
 #include "wcmd.h"
 #include "rxtx.h"
 #include "card.h"
-#include "control.h"
-#include "rndis.h"
+#include "usbpipe.h"
 
 static int msglevel = MSG_LEVEL_INFO;
 
@@ -130,7 +129,7 @@ void PSvDisablePowerSaving(struct vnt_private *pDevice)
 {
 
        /* disable power saving hw function */
-       CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_DISABLE_PS, 0,
+       vnt_control_out(pDevice, MESSAGE_TYPE_DISABLE_PS, 0,
                                                0, 0, NULL);
 
        /* clear AutoSleep */
@@ -163,7 +162,7 @@ int PSbConsiderPowerDown(struct vnt_private *pDevice, int bCheckRxDMA,
        u8 byData;
 
        /* check if already in Doze mode */
-       ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG,
+       vnt_control_in_u8(pDevice, MESSAGE_REQUEST_MACREG,
                                        MAC_REG_PSCTL, &byData);
 
        if ((byData & PSCTL_PS) != 0)