From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 15:40:55 +0000 (-0700) Subject: Staging: hv: netvsc: call vmbus_teardown_gpadl directly X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=314bf1d12a5f7597b316552b008051c26627eabb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Staging: hv: netvsc: call vmbus_teardown_gpadl directly Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index 1d2ebbe17e2c..4fc0fd9efad6 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c @@ -27,6 +27,7 @@ #include "logging.h" #include "netvsc.h" #include "rndis_filter.h" +#include "channel.h" /* Globals */ @@ -468,9 +469,8 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) if (NetDevice->ReceiveBufferGpadlHandle) { DPRINT_INFO(NETVSC, "Tearing down receive buffer's GPADL..."); - ret = NetDevice->Device->Driver->VmbusChannelInterface.TeardownGpadl( - NetDevice->Device, - NetDevice->ReceiveBufferGpadlHandle); + ret = vmbus_teardown_gpadl(NetDevice->Device->context, + NetDevice->ReceiveBufferGpadlHandle); /* If we failed here, we might as well return and have a leak rather than continue and a bugchk */ if (ret != 0) { @@ -540,8 +540,8 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) /* Teardown the gpadl on the vsp end */ if (NetDevice->SendBufferGpadlHandle) { DPRINT_INFO(NETVSC, "Tearing down send buffer's GPADL..."); - - ret = NetDevice->Device->Driver->VmbusChannelInterface.TeardownGpadl(NetDevice->Device, NetDevice->SendBufferGpadlHandle); + ret = vmbus_teardown_gpadl(NetDevice->Device->context, + NetDevice->SendBufferGpadlHandle); /* * If we failed here, we might as well return and have a leak