---

yaml --- r: 249672 b: refs/heads/master c: 8553d75 h: refs/heads/master v: v3
git-mirror · May 17, 2011 · 466cdc0 · 466cdc0
1 parent b25b3f1
commit 466cdc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 459bce97655c8ca19b113efce98be0dd8d800652
+refs/heads/master: 8553d753a494dfd952d7e44ab6f1171839b6185d
diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c
@@ -833,42 +833,11 @@ static int blkvsc_drv_init(void)
 	return ret;
 }
 
-static int blkvsc_drv_exit_cb(struct device *dev, void *data)
-{
-	struct device **curr = (struct device **)data;
-	*curr = dev;
-	return 1; /* stop iterating */
-}
 
 static void blkvsc_drv_exit(void)
 {
-	struct hv_driver *drv = &blkvsc_drv;
-	struct device *current_dev;
-	int ret;
-
-	while (1) {
-		current_dev = NULL;
-
-		/* Get the device */
-		ret = driver_for_each_device(&drv->driver, NULL,
-					     (void *) &current_dev,
-					     blkvsc_drv_exit_cb);
-
-		if (ret)
-			DPRINT_WARN(BLKVSC_DRV,
-				    "driver_for_each_device returned %d", ret);
-
-
-		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(&blkvsc_drv.driver);
 }
 
 /*