linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [media] cx18: remove redundant zero check on retval
@ 2018-06-11 15:10 Colin King
  2018-06-12  9:07 ` Dan Carpenter
  0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2018-06-11 15:10 UTC (permalink / raw)
  To: Stefan Richter, Mauro Carvalho Chehab, Andy Walls, Liam Girdwood,
	Mark Brown, linux-media, linux1394-devel
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

The check for a zero retval is redundant as all paths that lead to
this point have set retval to an error return value that is non-zero.
Remove the redundant check.

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

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/media/firewire/firedtv-fw.c  | 3 +++
 drivers/media/pci/cx18/cx18-driver.c | 2 --
 drivers/regulator/vctrl-regulator.c  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
index 92f4112d2e37..eed55be21836 100644
--- a/drivers/media/firewire/firedtv-fw.c
+++ b/drivers/media/firewire/firedtv-fw.c
@@ -271,6 +271,9 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
 
 	name_len = fw_csr_string(unit->directory, CSR_MODEL,
 				 name, sizeof(name));
+	if (name_len < 0)
+		return name_len;
+
 	for (i = ARRAY_SIZE(model_names); --i; )
 		if (strlen(model_names[i]) <= name_len &&
 		    strncmp(name, model_names[i], name_len) == 0)
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 8f314ca320c7..0c389a3fb4e5 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -1134,8 +1134,6 @@ static int cx18_probe(struct pci_dev *pci_dev,
 free_workqueues:
 	destroy_workqueue(cx->in_work_queue);
 err:
-	if (retval == 0)
-		retval = -ENODEV;
 	CX18_ERR("Error %d on initialization\n", retval);
 
 	v4l2_device_unregister(&cx->v4l2_dev);
diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c
index 78de002037c7..044e5a5ca163 100644
--- a/drivers/regulator/vctrl-regulator.c
+++ b/drivers/regulator/vctrl-regulator.c
@@ -340,7 +340,7 @@ static int vctrl_init_vtable(struct platform_device *pdev)
 		}
 	}
 
-	if (rdesc->n_voltages == 0) {
+	if (rdesc->n_voltages <= 0) {
 		dev_err(&pdev->dev, "invalid configuration\n");
 		return -EINVAL;
 	}
-- 
2.17.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] [media] cx18: remove redundant zero check on retval
  2018-06-11 15:10 [PATCH] [media] cx18: remove redundant zero check on retval Colin King
@ 2018-06-12  9:07 ` Dan Carpenter
  2018-06-12  9:12   ` Colin Ian King
  0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2018-06-12  9:07 UTC (permalink / raw)
  To: Colin King
  Cc: Stefan Richter, Mauro Carvalho Chehab, Andy Walls, Liam Girdwood,
	Mark Brown, linux-media, linux1394-devel, kernel-janitors,
	linux-kernel

You accidentally committed several changes...

regards,
dan carpenter

On Mon, Jun 11, 2018 at 04:10:45PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The check for a zero retval is redundant as all paths that lead to
> this point have set retval to an error return value that is non-zero.
> Remove the redundant check.
> 
> Detected by CoverityScan, CID#102589 ("Logically dead code")
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/media/firewire/firedtv-fw.c  | 3 +++
>  drivers/media/pci/cx18/cx18-driver.c | 2 --
>  drivers/regulator/vctrl-regulator.c  | 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
> index 92f4112d2e37..eed55be21836 100644
> --- a/drivers/media/firewire/firedtv-fw.c
> +++ b/drivers/media/firewire/firedtv-fw.c
> @@ -271,6 +271,9 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
>  
>  	name_len = fw_csr_string(unit->directory, CSR_MODEL,
>  				 name, sizeof(name));
> +	if (name_len < 0)
> +		return name_len;
> +
>  	for (i = ARRAY_SIZE(model_names); --i; )
>  		if (strlen(model_names[i]) <= name_len &&
>  		    strncmp(name, model_names[i], name_len) == 0)
> diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
> index 8f314ca320c7..0c389a3fb4e5 100644
> --- a/drivers/media/pci/cx18/cx18-driver.c
> +++ b/drivers/media/pci/cx18/cx18-driver.c
> @@ -1134,8 +1134,6 @@ static int cx18_probe(struct pci_dev *pci_dev,
>  free_workqueues:
>  	destroy_workqueue(cx->in_work_queue);
>  err:
> -	if (retval == 0)
> -		retval = -ENODEV;
>  	CX18_ERR("Error %d on initialization\n", retval);
>  
>  	v4l2_device_unregister(&cx->v4l2_dev);
> diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c
> index 78de002037c7..044e5a5ca163 100644
> --- a/drivers/regulator/vctrl-regulator.c
> +++ b/drivers/regulator/vctrl-regulator.c
> @@ -340,7 +340,7 @@ static int vctrl_init_vtable(struct platform_device *pdev)
>  		}
>  	}
>  
> -	if (rdesc->n_voltages == 0) {
> +	if (rdesc->n_voltages <= 0) {
>  		dev_err(&pdev->dev, "invalid configuration\n");
>  		return -EINVAL;
>  	}
> -- 
> 2.17.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] [media] cx18: remove redundant zero check on retval
  2018-06-12  9:07 ` Dan Carpenter
@ 2018-06-12  9:12   ` Colin Ian King
  0 siblings, 0 replies; 3+ messages in thread
From: Colin Ian King @ 2018-06-12  9:12 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Stefan Richter, Mauro Carvalho Chehab, Andy Walls, Liam Girdwood,
	Mark Brown, linux-media, linux1394-devel, kernel-janitors,
	linux-kernel

On 12/06/18 10:07, Dan Carpenter wrote:
> You accidentally committed several changes...

Sheesh, I was on some strong pain killers yesterday for a slipped disc,
I think they are impacting on my ability to think straight.

Colin

> 
> regards,
> dan carpenter
> 
> On Mon, Jun 11, 2018 at 04:10:45PM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> The check for a zero retval is redundant as all paths that lead to
>> this point have set retval to an error return value that is non-zero.
>> Remove the redundant check.
>>
>> Detected by CoverityScan, CID#102589 ("Logically dead code")
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>  drivers/media/firewire/firedtv-fw.c  | 3 +++
>>  drivers/media/pci/cx18/cx18-driver.c | 2 --
>>  drivers/regulator/vctrl-regulator.c  | 2 +-
>>  3 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
>> index 92f4112d2e37..eed55be21836 100644
>> --- a/drivers/media/firewire/firedtv-fw.c
>> +++ b/drivers/media/firewire/firedtv-fw.c
>> @@ -271,6 +271,9 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
>>  
>>  	name_len = fw_csr_string(unit->directory, CSR_MODEL,
>>  				 name, sizeof(name));
>> +	if (name_len < 0)
>> +		return name_len;
>> +
>>  	for (i = ARRAY_SIZE(model_names); --i; )
>>  		if (strlen(model_names[i]) <= name_len &&
>>  		    strncmp(name, model_names[i], name_len) == 0)
>> diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
>> index 8f314ca320c7..0c389a3fb4e5 100644
>> --- a/drivers/media/pci/cx18/cx18-driver.c
>> +++ b/drivers/media/pci/cx18/cx18-driver.c
>> @@ -1134,8 +1134,6 @@ static int cx18_probe(struct pci_dev *pci_dev,
>>  free_workqueues:
>>  	destroy_workqueue(cx->in_work_queue);
>>  err:
>> -	if (retval == 0)
>> -		retval = -ENODEV;
>>  	CX18_ERR("Error %d on initialization\n", retval);
>>  
>>  	v4l2_device_unregister(&cx->v4l2_dev);
>> diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c
>> index 78de002037c7..044e5a5ca163 100644
>> --- a/drivers/regulator/vctrl-regulator.c
>> +++ b/drivers/regulator/vctrl-regulator.c
>> @@ -340,7 +340,7 @@ static int vctrl_init_vtable(struct platform_device *pdev)
>>  		}
>>  	}
>>  
>> -	if (rdesc->n_voltages == 0) {
>> +	if (rdesc->n_voltages <= 0) {
>>  		dev_err(&pdev->dev, "invalid configuration\n");
>>  		return -EINVAL;
>>  	}
>> -- 
>> 2.17.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-12  9:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-11 15:10 [PATCH] [media] cx18: remove redundant zero check on retval Colin King
2018-06-12  9:07 ` Dan Carpenter
2018-06-12  9:12   ` Colin Ian King

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).