---

yaml --- r: 268371 b: refs/heads/master c: d437217 h: refs/heads/master i: 268369: 131ef18 268367: 898f085 v: v3
git-mirror · Sep 16, 2011 · 457dc35 · 457dc35
1 parent 44ba370
commit 457dc35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab101e86d0f2c00c11aec5b16e27246ccecb0870
+refs/heads/master: d4372179c85b50cf0a468c1d573113056b0c46a0
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -334,22 +334,14 @@ static int vmbus_probe(struct device *child_device)
  */
 static int vmbus_remove(struct device *child_device)
 {
-	int ret;
-	struct hv_driver *drv;
-
+	struct hv_driver *drv = drv_to_hv_drv(child_device->driver);
 	struct hv_device *dev = device_to_hv_device(child_device);
 
-	if (child_device->driver) {
-		drv = drv_to_hv_drv(child_device->driver);
-
-		if (drv->remove) {
-			ret = drv->remove(dev);
-		} else {
-			pr_err("remove not set for driver %s\n",
-				dev_name(child_device));
-			ret = -ENODEV;
-		}
-	}
+	if (drv->remove)
+		drv->remove(dev);
+	else
+		pr_err("remove not set for driver %s\n",
+			dev_name(child_device));
 
 	return 0;
 }