From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 21 Oct 2010 16:59:06 +0000 (-0700)
Subject: Staging: hv: storvsc: call vmbus_open directly
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=60f841ac36cc7eff80239bd219cda7cafac3ea2a;p=deliverable%2Flinux.git

Staging: hv: storvsc: call vmbus_open directly

Don't do the interface indirection, it's not needed at all.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index d63cd37743b4..19e87f689fa0 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/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);