From f0c2e4962a3c4c880843a82425dfdd70d3d07cf8 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 21 Oct 2010 09:59:06 -0700
Subject: [PATCH] --- yaml --- r: 220439 b: refs/heads/master c:
 60f841ac36cc7eff80239bd219cda7cafac3ea2a h: refs/heads/master i:   220437:
 6f5a44dc5427533d2e3aca66b69f196493c06e94   220435:
 4375a9923e57f2917f1c9084b1a89aad426cd7ca   220431:
 d708aed27db11bbd9013f551b6c7ec340faea2be v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/staging/hv/storvsc.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 23daa4077bc3..51994d905dfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81c92f43e783dc247d3672211e3c4a94e76f4286
+refs/heads/master: 60f841ac36cc7eff80239bd219cda7cafac3ea2a
diff --git a/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
index d63cd37743b4..19e87f689fa0 100644
--- a/trunk/drivers/staging/hv/storvsc.c
+++ b/trunk/drivers/staging/hv/storvsc.c
@@ -499,13 +499,11 @@ static int StorVscConnectToVsp(struct hv_device *Device)
 	memset(&props, 0, sizeof(struct vmstorage_channel_properties));
 
 	/* Open the channel */
-	ret = Device->Driver->VmbusChannelInterface.Open(Device,
-			storDriver->RingBufferSize,
-			storDriver->RingBufferSize,
-			(void *)&props,
-			sizeof(struct vmstorage_channel_properties),
-			StorVscOnChannelCallback,
-			Device);
+	ret = vmbus_open(Device->channel,
+			 storDriver->RingBufferSize, storDriver->RingBufferSize,
+			 (void *)&props,
+			 sizeof(struct vmstorage_channel_properties),
+			 StorVscOnChannelCallback, Device);
 
 	DPRINT_DBG(STORVSC, "storage props: path id %d, tgt id %d, max xfer %d",
 		   props.PathId, props.TargetId, props.MaxTransferBytes);