---

yaml --- r: 249675 b: refs/heads/master c: a881fdd h: refs/heads/master i: 249673: 34c643d 249671: b25b3f1 v: v3
git-mirror · May 17, 2011 · 56754f4 · 56754f4
1 parent dc1b203
commit 56754f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git 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
@@ -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,
-					     &current_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))