2021-01-21 08:34:24

by Abaci Team

Subject: [PATCH] media: atomisp: remove redundant NULL check

Fix below warnings reported by coccicheck:
./drivers/staging/media/atomisp/pci/sh_css_params.c:1575:2-8: WARNING:
NULL check before some freeing functions is not needed.
./drivers/staging/media/atomisp/pci/sh_css_params.c:3006:2-8: WARNING:
NULL check before some freeing functions is not needed.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
drivers/staging/media/atomisp/pci/sh_css_params.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
index 24fc497..569473b9 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_params.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_params.c
@@ -1575,8 +1575,7 @@ struct ia_css_isp_3a_statistics_map *
return me;

err:
- if (me)
- kvfree(me);
+ kvfree(me);
return NULL;
}

@@ -3006,8 +3005,7 @@ static void free_map(struct sh_css_ddr_address_map *map)
}

kvfree(params);
- if (per_frame_params)
- kvfree(per_frame_params);
+ kvfree(per_frame_params);
stream->isp_params_configs = NULL;
stream->per_frame_isp_params_configs = NULL;

--
1.8.3.1

2021-01-22 08:56:02

by Robert Foss

Subject: Re: [PATCH] media: atomisp: remove redundant NULL check

Thanks for the patch.

Feel free to add my r-b:
Reviewed-by: Robert Foss <[email protected]>

On Thu, 21 Jan 2021 at 09:31, Yang Li <[email protected]> wrote:
>
> Fix below warnings reported by coccicheck:
> ./drivers/staging/media/atomisp/pci/sh_css_params.c:1575:2-8: WARNING:
> NULL check before some freeing functions is not needed.
> ./drivers/staging/media/atomisp/pci/sh_css_params.c:3006:2-8: WARNING:
> NULL check before some freeing functions is not needed.
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>
> ---
> drivers/staging/media/atomisp/pci/sh_css_params.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
> index 24fc497..569473b9 100644
> --- a/drivers/staging/media/atomisp/pci/sh_css_params.c
> +++ b/drivers/staging/media/atomisp/pci/sh_css_params.c
> @@ -1575,8 +1575,7 @@ struct ia_css_isp_3a_statistics_map *
> return me;
>
> err:
> - if (me)
> - kvfree(me);
> + kvfree(me);
> return NULL;
> }
>
> @@ -3006,8 +3005,7 @@ static void free_map(struct sh_css_ddr_address_map *map)
> }
>
> kvfree(params);
> - if (per_frame_params)
> - kvfree(per_frame_params);
> + kvfree(per_frame_params);
> stream->isp_params_configs = NULL;
> stream->per_frame_isp_params_configs = NULL;
>
> --
> 1.8.3.1
>