2021-06-12 13:28:41

by Colin King

[permalink] [raw]
Subject: [PATCH] leds: flash: Remove redundant initialization of variable ret

From: Colin Ian King <[email protected]>

The variable ret is being initialized with a value that is never read,
it is being updated later on. The assignment is redundant and can be
removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/leds/led-class-flash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/led-class-flash.c b/drivers/leds/led-class-flash.c
index 6eeb9effcf65..e4c4fd97bf30 100644
--- a/drivers/leds/led-class-flash.c
+++ b/drivers/leds/led-class-flash.c
@@ -92,7 +92,7 @@ static ssize_t flash_strobe_store(struct device *dev,
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);
unsigned long state;
- ssize_t ret = -EINVAL;
+ ssize_t ret;

mutex_lock(&led_cdev->led_access);

--
2.31.1


2021-08-16 06:53:26

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH] leds: flash: Remove redundant initialization of variable ret

Hi!

> From: Colin Ian King <[email protected]>
>
> The variable ret is being initialized with a value that is never read,
> it is being updated later on. The assignment is redundant and can be
> removed.
>
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Colin Ian King <[email protected]>

I did this instead; hopefully that's okay with everyone.

Best regards,
Pavel

commit 654933ae7d32f278eecd0bb0f175785574ac4775
Author: Pavel Machek <[email protected]>
Date: Mon Aug 16 08:47:08 2021 +0200

leds: flash: Remove redundant initialization of variable ret

Adjust initialization not to trigger Coverity warnings.

Reported-by: Colin Ian King <[email protected]>
Signed-off-by: Pavel Machek <[email protected]>

diff --git a/drivers/leds/led-class-flash.c b/drivers/leds/led-class-flash.c
index 6eeb9effcf65..185e17055317 100644
--- a/drivers/leds/led-class-flash.c
+++ b/drivers/leds/led-class-flash.c
@@ -92,14 +92,12 @@ static ssize_t flash_strobe_store(struct device *dev,
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);
unsigned long state;
- ssize_t ret = -EINVAL;
+ ssize_t ret = -EBUSY;

mutex_lock(&led_cdev->led_access);

- if (led_sysfs_is_disabled(led_cdev)) {
- ret = -EBUSY;
+ if (led_sysfs_is_disabled(led_cdev))
goto unlock;
- }

ret = kstrtoul(buf, 10, &state);
if (ret)


--
http://www.livejournal.com/~pavelmachek

Attachments:
(No filename) (1.50 kB)
 signature.asc (201.00 B)
 Download all attachments

2021-08-16 08:00:06

by Colin King

[permalink] [raw]
Subject: Re: [PATCH] leds: flash: Remove redundant initialization of variable ret

On 16/08/2021 07:51, Pavel Machek wrote:
> Hi!
>
>> From: Colin Ian King <[email protected]>
>>
>> The variable ret is being initialized with a value that is never read,
>> it is being updated later on. The assignment is redundant and can be
>> removed.
>>
>> Addresses-Coverity: ("Unused value")
>> Signed-off-by: Colin Ian King <[email protected]>
>
> I did this instead; hopefully that's okay with everyone.
>
> Best regards,
> Pavel

Thanks, looks good to me.

Colin

>
> commit 654933ae7d32f278eecd0bb0f175785574ac4775
> Author: Pavel Machek <[email protected]>
> Date: Mon Aug 16 08:47:08 2021 +0200
>
> leds: flash: Remove redundant initialization of variable ret
>
> Adjust initialization not to trigger Coverity warnings.
>
> Reported-by: Colin Ian King <[email protected]>
> Signed-off-by: Pavel Machek <[email protected]>
>
> diff --git a/drivers/leds/led-class-flash.c b/drivers/leds/led-class-flash.c
> index 6eeb9effcf65..185e17055317 100644
> --- a/drivers/leds/led-class-flash.c
> +++ b/drivers/leds/led-class-flash.c
> @@ -92,14 +92,12 @@ static ssize_t flash_strobe_store(struct device *dev,
> struct led_classdev *led_cdev = dev_get_drvdata(dev);
> struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);
> unsigned long state;
> - ssize_t ret = -EINVAL;
> + ssize_t ret = -EBUSY;
>
> mutex_lock(&led_cdev->led_access);
>
> - if (led_sysfs_is_disabled(led_cdev)) {
> - ret = -EBUSY;
> + if (led_sysfs_is_disabled(led_cdev))
> goto unlock;
> - }
>
> ret = kstrtoul(buf, 10, &state);
> if (ret)
>
>