From: David Kershner <david.kershner@unisys.com>
Date: Thu, 31 Mar 2016 00:38:49 +0000 (-0400)
Subject: staging: unisys: remove wmb() in visordriver_remove_device
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=64938182e7836650feeb9b2b9dadd510ed4b0dad;p=linux-beck.git

staging: unisys: remove wmb() in visordriver_remove_device

Don't need to have a wmb() in visordriver_remove_device. Also removed
an unnecessary check for drv being null.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 1fcb1775bb59..547be8b50956 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -613,20 +613,12 @@ visordriver_remove_device(struct device *xdev)
 	drv = to_visor_driver(xdev->driver);
 	down(&dev->visordriver_callback_lock);
 	dev->being_removed = true;
-	/*
-	 * ensure that the dev->being_removed flag is set before we start the
-	 * actual removal
-	 */
-	wmb();
-	if (drv) {
-		if (drv->remove)
-			drv->remove(dev);
-	}
+	if (drv->remove)
+		drv->remove(dev);
 	up(&dev->visordriver_callback_lock);
 	dev_stop_periodic_work(dev);
 
 	put_device(&dev->device);
-
 	return 0;
 }