diff mbox series

usb: typec: silence a static checker warning

Message ID YHadaACH8Mq/10F7@mwanda (mailing list archive)
State Accepted
Commit 434438d8f9d3f2bc8f404b937f87a70da3fbc7fb
Headers show
Series usb: typec: silence a static checker warning | expand

Commit Message

Dan Carpenter April 14, 2021, 7:44 a.m. UTC
Smatch complains about a potential missing error code:

    drivers/usb/typec/port-mapper.c:168 typec_link_port()
    warn: missing error code 'ret'

This is a false positive and returning zero is intentional.  Let's
re-arrange the code to silence the warning and make the intent more
clear.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/usb/typec/port-mapper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Heikki Krogerus April 14, 2021, 8:01 a.m. UTC | #1
On Wed, Apr 14, 2021 at 10:44:40AM +0300, Dan Carpenter wrote:
> Smatch complains about a potential missing error code:
> 
>     drivers/usb/typec/port-mapper.c:168 typec_link_port()
>     warn: missing error code 'ret'
> 
> This is a false positive and returning zero is intentional.  Let's
> re-arrange the code to silence the warning and make the intent more
> clear.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/port-mapper.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/typec/port-mapper.c b/drivers/usb/typec/port-mapper.c
> index fae736eb0601..9b0991bdf391 100644
> --- a/drivers/usb/typec/port-mapper.c
> +++ b/drivers/usb/typec/port-mapper.c
> @@ -157,15 +157,17 @@ int typec_link_port(struct device *port)
>  {
>  	struct device *connector;
>  	struct port_node *node;
> -	int ret = 0;
> +	int ret;
>  
>  	node = create_port_node(port);
>  	if (IS_ERR(node))
>  		return PTR_ERR(node);
>  
>  	connector = find_connector(node);
> -	if (!connector)
> +	if (!connector) {
> +		ret = 0;
>  		goto remove_node;
> +	}
>  
>  	ret = link_port(to_typec_port(connector), node);
>  	if (ret)
> -- 
> 2.30.2

thanks,
diff mbox series

Patch

diff --git a/drivers/usb/typec/port-mapper.c b/drivers/usb/typec/port-mapper.c
index fae736eb0601..9b0991bdf391 100644
--- a/drivers/usb/typec/port-mapper.c
+++ b/drivers/usb/typec/port-mapper.c
@@ -157,15 +157,17 @@  int typec_link_port(struct device *port)
 {
 	struct device *connector;
 	struct port_node *node;
-	int ret = 0;
+	int ret;
 
 	node = create_port_node(port);
 	if (IS_ERR(node))
 		return PTR_ERR(node);
 
 	connector = find_connector(node);
-	if (!connector)
+	if (!connector) {
+		ret = 0;
 		goto remove_node;
+	}
 
 	ret = link_port(to_typec_port(connector), node);
 	if (ret)