Skip to content

Commit

Permalink
Staging: hv: netvsc: Inline the code for free_net_device()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 29, 2011
1 parent 5e6f4d0 commit 356c465
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -980,7 +972,7 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
release_outbound_net_device(device);
release_inbound_net_device(device);

free_net_device(net_device);
kfree(net_device);
}

return ret;
Expand Down

0 comments on commit 356c465

Please sign in to comment.