From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 19 Feb 2019 13:43:33 +0000 (+0000)
Subject: usb: typec: mux: remove redundant check on variable match
X-Git-Tag: v5.1-rc1~142^2~20
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=eb76b37aaf7e6bdd6638bf5b2ef29688645e03b8;p=linux.git

usb: typec: mux: remove redundant check on variable match

All the code paths that lead to the return statement are where
match is always true, hence the check to see if it is true is
redundant and can be removed.

Detected by CoverityScan, CID#14769672 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index 54d74978df9c..2ce54f3fc79c 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -184,7 +184,7 @@ static void *typec_mux_match(struct device_connection *con, int ep, void *data)
 		if (dev_fwnode(mux->dev) == con->fwnode)
 			return mux;
 
-	return match ? ERR_PTR(-EPROBE_DEFER) : NULL;
+	return ERR_PTR(-EPROBE_DEFER);
 }
 
 /**