From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Mon, 16 Mar 2015 17:57:48 +0000 (-0400)
Subject: staging: unisys: remove unnecessary complication from delete_vbus_device
X-Git-Tag: firefly_0821_release~176^2~1998^2~138^2~216
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c394650650b0fc91aebfef601c5a427ef387bb72;p=firefly-linux-kernel-4.4.55.git

staging: unisys: remove unnecessary complication from delete_vbus_device

Take out the variable used to compute a comparison against NULL, and
just use the parameter directly.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 3f399e60ae8d..b169d392fce9 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -400,10 +400,9 @@ delete_vbus(struct del_vbus_guestpart *delparams)
 static int
 delete_vbus_device(struct device *vbus, void *data)
 {
-	int checkforroot = (data != NULL);
 	struct device *dev = &virtpci_rootbus_device;
 
-	if ((checkforroot) && match_busid(vbus, (void *)BUS_ID(dev))) {
+	if ((data) && match_busid(vbus, (void *)BUS_ID(dev))) {
 		/* skip it - don't delete root bus */
 		return 0;	/* pretend no error */
 	}