From a881fdd0cab987336a7a1b99630b3460689a3a60 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:34:47 -0700 Subject: [PATCH] Staging: hv: netvsc_drv: Clean up the netvsc_drv_exit() function To conform to the Linux device model, the device should persist even when there is no driver bound to it. Cleanup the netvsc_drv_exit() routine keeping this in mind. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/netvsc_drv.c | 34 +-------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index ced380289962..7b6844f16c4a 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/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)) -- 2.20.1