From 34c643d7b36168e09cbde88a5dd864e30d5a8f04 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 12 May 2011 19:34:45 -0700
Subject: [PATCH] --- yaml --- r: 249673 b: refs/heads/master c:
 2bda87cb6c765bf2178d3da90367bf53dbcc14d6 h: refs/heads/master i:   249671:
 b25b3f1fc862014260081de1e51e0c51167c81ff v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/hv/storvsc_drv.c | 30 +-------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 715775804e51..ff2b812a3f4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8553d753a494dfd952d7e44ab6f1171839b6185d
+refs/heads/master: 2bda87cb6c765bf2178d3da90367bf53dbcc14d6
diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c
index d811385ee8d8..942cc5f98db1 100644
--- a/trunk/drivers/staging/hv/storvsc_drv.c
+++ b/trunk/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 *) &current_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)