]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Staging: hv: netvsc: Inline the code for free_net_device()
authorK. Y. Srinivasan <kys@microsoft.com>
Sat, 27 Aug 2011 18:31:10 +0000 (11:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 18:01:04 +0000 (11:01 -0700)
Inline the code for free_net_device().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/netvsc.c

index b6e1fb988d2343983834ae758eb009367be85107..75c6ed7b790aee5a1424086612db5837406671ab 100644 (file)
@@ -49,14 +49,6 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
        return net_device;
 }
 
-static void free_net_device(struct netvsc_device *device)
-{
-       WARN_ON(atomic_read(&device->refcnt) != 0);
-       device->dev->ext = NULL;
-       kfree(device);
-}
-
-
 /* Get the net device object iff exists and its refcount > 1 */
 static struct netvsc_device *get_outbound_net_device(struct hv_device *device)
 {
@@ -438,7 +430,7 @@ int netvsc_device_remove(struct hv_device *device)
                kfree(netvsc_packet);
        }
 
-       free_net_device(net_device);
+       kfree(net_device);
        return 0;
 }
 
@@ -980,7 +972,7 @@ cleanup:
                release_outbound_net_device(device);
                release_inbound_net_device(device);
 
-               free_net_device(net_device);
+               kfree(net_device);
        }
 
        return ret;