2021-02-18 20:32:35

by Colin King

Subject: [PATCH][V2] drivers/base/cpu: remove redundant assignment of variable retval

From: Colin Ian King <[email protected]>

The variable retval is being initialized with a value that is never read
and it is being updated later with a new value. Clean this up by
initializing retval to -ENOMEM and remove the assignment to retval
on the !dev failure path.

Kudos to Rafael for the improved fix suggestion.

Signed-off-by: Colin Ian King <[email protected]>
---
V1: Remove initialization of retval
V2: Initialiation of retval with -ENOMEM and remove assignment in
!dev failure path.
---
drivers/base/cpu.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 8f1d6569564c..2b9e41377a07 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -409,13 +409,11 @@ __cpu_device_create(struct device *parent, void *drvdata,
const char *fmt, va_list args)
{
struct device *dev = NULL;
- int retval = -ENODEV;
+ int retval = -ENOMEM;

dev = kzalloc(sizeof(*dev), GFP_KERNEL);
- if (!dev) {
- retval = -ENOMEM;
+ if (!dev)
goto error;
- }

device_initialize(dev);
dev->parent = parent;
--
2.30.0

2021-02-19 13:49:22

by Rafael J. Wysocki

Subject: Re: [PATCH][V2] drivers/base/cpu: remove redundant assignment of variable retval

On Thu, Feb 18, 2021 at 9:28 PM Colin King <[email protected]> wrote:
>
> From: Colin Ian King <[email protected]>
>
> The variable retval is being initialized with a value that is never read
> and it is being updated later with a new value. Clean this up by
> initializing retval to -ENOMEM and remove the assignment to retval
> on the !dev failure path.
>
> Kudos to Rafael for the improved fix suggestion.
>
> Signed-off-by: Colin Ian King <[email protected]>

Reviewed-by: Rafael J. Wysocki <[email protected]>

> ---
> V1: Remove initialization of retval
> V2: Initialiation of retval with -ENOMEM and remove assignment in
> !dev failure path.
> ---
> drivers/base/cpu.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
> index 8f1d6569564c..2b9e41377a07 100644
> --- a/drivers/base/cpu.c
> +++ b/drivers/base/cpu.c
> @@ -409,13 +409,11 @@ __cpu_device_create(struct device *parent, void *drvdata,
> const char *fmt, va_list args)
> {
> struct device *dev = NULL;
> - int retval = -ENODEV;
> + int retval = -ENOMEM;
>
> dev = kzalloc(sizeof(*dev), GFP_KERNEL);
> - if (!dev) {
> - retval = -ENOMEM;
> + if (!dev)
> goto error;
> - }
>
> device_initialize(dev);
> dev->parent = parent;
> --
> 2.30.0
>