From 56754f4e867f9704f44ea3d3bf8a12f27f4aa87d Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:34:47 -0700 Subject: [PATCH] --- yaml --- r: 249675 b: refs/heads/master c: a881fdd0cab987336a7a1b99630b3460689a3a60 h: refs/heads/master i: 249673: 34c643d7b36168e09cbde88a5dd864e30d5a8f04 249671: b25b3f1fc862014260081de1e51e0c51167c81ff v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc_drv.c | 34 +-------------------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/[refs] b/[refs] index b73e59e97209..895883ca5aa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96053efd3c8e13f85abe9783be0e70cb97e82f2b +refs/heads/master: a881fdd0cab987336a7a1b99630b3460689a3a60 diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c index ced380289962..7b6844f16c4a 100644 --- a/trunk/drivers/staging/hv/netvsc_drv.c +++ b/trunk/drivers/staging/hv/netvsc_drv.c @@ -428,15 +428,6 @@ static int netvsc_remove(struct hv_device *dev) return ret; } -static int netvsc_drv_exit_cb(struct device *dev, void *data) -{ - struct device **curr = (struct device **)data; - - *curr = dev; - /* stop iterating */ - return 1; -} - /* The one and only one */ static struct netvsc_driver netvsc_drv = { .base.probe = netvsc_probe, @@ -445,30 +436,7 @@ static struct netvsc_driver netvsc_drv = { static void netvsc_drv_exit(void) { - struct hv_driver *drv = &netvsc_drv.base; - struct device *current_dev; - int ret; - - while (1) { - current_dev = NULL; - - /* Get the device */ - ret = driver_for_each_device(&drv->driver, NULL, - ¤t_dev, netvsc_drv_exit_cb); - - if (current_dev == NULL) - break; - - /* Initiate removal from the top-down */ - dev_err(current_dev, "unregistering device (%s)...\n", - dev_name(current_dev)); - - device_unregister(current_dev); - } - - vmbus_child_driver_unregister(&drv->driver); - - return; + vmbus_child_driver_unregister(&netvsc_drv.base.driver); } static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))