Staging: hv: netvsc: call vmbus_close directly
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Oct 2010 16:53:31 +0000 (09:53 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Oct 2010 16:53:31 +0000 (09:53 -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 be3825690a2746a9c41244f986531bf5b357ebc6..8b73144e7c12213edacee10f8b81ce9b84530bbf 100644 (file)
@@ -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,