diff mbox series

[next] usb: typec: mux: remove redundant check on variable match

Message ID 20190219134333.10142-1-colin.king@canonical.com (mailing list archive)
State Mainlined
Commit eb76b37aaf7e6bdd6638bf5b2ef29688645e03b8
Headers show
Series [next] usb: typec: mux: remove redundant check on variable match | expand

Commit Message

Colin King Feb. 19, 2019, 1:43 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

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>
---
 drivers/usb/typec/mux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Heikki Krogerus Feb. 19, 2019, 2:45 p.m. UTC | #1 
On Tue, Feb 19, 2019 at 01:43:33PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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>

> ---
>  drivers/usb/typec/mux.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> index a5947d98824d..b94e2920eb38 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);
>  }
>  
>  /**
> -- 
> 2.20.1

thanks,
diff mbox series

Patch

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index a5947d98824d..b94e2920eb38 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);
 }
 
 /**