Staging: hv: netvsc: call vmbus_teardown_gpadl directly
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Oct 2010 15:40:55 +0000 (08:40 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Oct 2010 15:40:55 +0000 (08:40 -0700)
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>
drivers/staging/hv/netvsc.c

index 1d2ebbe..4fc0fd9 100644 (file)
@@ -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