From 2bda87cb6c765bf2178d3da90367bf53dbcc14d6 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:34:45 -0700 Subject: [PATCH] Staging: hv: storvsc_drv: Cleanup storvsc_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 storvsc_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/storvsc_drv.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index d811385ee8d8..942cc5f98db1 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -792,37 +792,9 @@ static int storvsc_drv_init(void) return ret; } -static int storvsc_drv_exit_cb(struct device *dev, void *data) -{ - struct device **curr = (struct device **)data; - *curr = dev; - return 1; /* stop iterating */ -} - static void storvsc_drv_exit(void) { - struct hv_driver *drv = &storvsc_drv; - struct device *current_dev = NULL; - int ret; - - while (1) { - current_dev = NULL; - - /* Get the device */ - ret = driver_for_each_device(&drv->driver, NULL, - (void *) ¤t_dev, - storvsc_drv_exit_cb); - - - if (current_dev == NULL) - break; - - /* Initiate removal from the top-down */ - device_unregister(current_dev); - } - - vmbus_child_driver_unregister(&drv->driver); - return; + vmbus_child_driver_unregister(&storvsc_drv.driver); } static int __init storvsc_init(void) -- 2.20.1