diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 11:40:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 11:40:55 -0400 |
commit | 314bf1d12a5f7597b316552b008051c26627eabb (patch) | |
tree | a5ffd6eb309bb2d91f54b780470841fee4b236fc | |
parent | 18726d7a60fdced593b94ff7cc5264ba753ef656 (diff) |
Staging: hv: netvsc: call vmbus_teardown_gpadl 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>
-rw-r--r-- | drivers/staging/hv/netvsc.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ | |||
27 | #include "logging.h" | 27 | #include "logging.h" |
28 | #include "netvsc.h" | 28 | #include "netvsc.h" |
29 | #include "rndis_filter.h" | 29 | #include "rndis_filter.h" |
30 | #include "channel.h" | ||
30 | 31 | ||
31 | 32 | ||
32 | /* Globals */ | 33 | /* Globals */ |
@@ -468,9 +469,8 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) | |||
468 | if (NetDevice->ReceiveBufferGpadlHandle) { | 469 | if (NetDevice->ReceiveBufferGpadlHandle) { |
469 | DPRINT_INFO(NETVSC, "Tearing down receive buffer's GPADL..."); | 470 | DPRINT_INFO(NETVSC, "Tearing down receive buffer's GPADL..."); |
470 | 471 | ||
471 | ret = NetDevice->Device->Driver->VmbusChannelInterface.TeardownGpadl( | 472 | ret = vmbus_teardown_gpadl(NetDevice->Device->context, |
472 | NetDevice->Device, | 473 | NetDevice->ReceiveBufferGpadlHandle); |
473 | NetDevice->ReceiveBufferGpadlHandle); | ||
474 | 474 | ||
475 | /* If we failed here, we might as well return and have a leak rather than continue and a bugchk */ | 475 | /* If we failed here, we might as well return and have a leak rather than continue and a bugchk */ |
476 | if (ret != 0) { | 476 | if (ret != 0) { |
@@ -540,8 +540,8 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) | |||
540 | /* Teardown the gpadl on the vsp end */ | 540 | /* Teardown the gpadl on the vsp end */ |
541 | if (NetDevice->SendBufferGpadlHandle) { | 541 | if (NetDevice->SendBufferGpadlHandle) { |
542 | DPRINT_INFO(NETVSC, "Tearing down send buffer's GPADL..."); | 542 | DPRINT_INFO(NETVSC, "Tearing down send buffer's GPADL..."); |
543 | 543 | ret = vmbus_teardown_gpadl(NetDevice->Device->context, | |
544 | ret = NetDevice->Device->Driver->VmbusChannelInterface.TeardownGpadl(NetDevice->Device, NetDevice->SendBufferGpadlHandle); | 544 | NetDevice->SendBufferGpadlHandle); |
545 | 545 | ||
546 | /* | 546 | /* |
547 | * If we failed here, we might as well return and have a leak | 547 | * If we failed here, we might as well return and have a leak |