diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 09:53:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 09:53:31 -0700 |
| commit | 1fb9dff04c97398c4c10a97037aa1c3505663153 (patch) | |
| tree | 45420eb5ffad9ebe91c7273b5220372fb81bed25 /drivers/staging | |
| parent | 1382e0178eeb073594c90a80409e0923adc5048c (diff) | |
Staging: hv: netvsc: call vmbus_close 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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/hv/netvsc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index be3825690a2..8b73144e7c1 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c @@ -738,7 +738,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) if (ret != 0) { DPRINT_ERR(NETVSC, "unable to connect to NetVSP - %d", ret); ret = -1; - goto Close; + goto close; } DPRINT_INFO(NETVSC, "*** NetVSC channel handshake result - %d ***", @@ -746,9 +746,9 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) return ret; -Close: +close: /* Now, we can close the channel safely */ - Device->Driver->VmbusChannelInterface.Close(Device); + vmbus_close(Device->channel); Cleanup: @@ -810,7 +810,7 @@ static int NetVscOnDeviceRemove(struct hv_device *Device) DPRINT_INFO(NETVSC, "net device (%p) safe to remove", netDevice); /* Now, we can close the channel safely */ - Device->Driver->VmbusChannelInterface.Close(Device); + vmbus_close(Device->channel); /* Release all resources */ list_for_each_entry_safe(netvscPacket, pos, |