[PATCH 14/40] Staging: hv: netvsc: Inline the code for free_net_device()
K. Y. Srinivasan
kys at microsoft.com
Wed Jun 29 14:39:11 UTC 2011
Inline the code for free_net_device().
Signed-off-by: K. Y. Srinivasan <kys at microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz at microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane at microsoft.com>
Signed-off-by: Hank Janssen <hjanssen at microsoft.com>
---
drivers/staging/hv/netvsc.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index bdd5c2b..c3c934c 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -51,14 +51,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)
{
@@ -444,7 +436,7 @@ int netvsc_device_remove(struct hv_device *device)
kfree(netvsc_packet);
}
- free_net_device(net_device);
+ kfree(net_device);
return 0;
}
@@ -994,7 +986,7 @@ cleanup:
release_outbound_net_device(device);
release_inbound_net_device(device);
- free_net_device(net_device);
+ kfree(net_device);
}
return ret;
--
1.7.4.1
More information about the devel
mailing list