Staging: hv: vmbus: Cleanup vmbus_remove()

vmbus_remove() cannot fail; clean it up accordingly.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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 = drv_to_hv_drv(child_device->driver);
-	struct hv_driver *drv;
-
 	struct hv_device *dev = device_to_hv_device(child_device);
 
-	if (child_device->driver) {
+	if (drv->remove)
-		drv = drv_to_hv_drv(child_device->driver);
+		drv->remove(dev);
-
+	else
-		if (drv->remove) {
+		pr_err("remove not set for driver %s\n",
-			ret = drv->remove(dev);
+			dev_name(child_device));
-		} else {
-			pr_err("remove not set for driver %s\n",
-				dev_name(child_device));
-			ret = -ENODEV;
-		}
-	}
 
 	return 0;
 }