linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mmc-utils: Remove unnecessary null pointer checks
@ 2025-07-03  5:48 Avri Altman
  2025-07-03 14:17 ` Ulf Hansson
  0 siblings, 1 reply; 2+ messages in thread
From: Avri Altman @ 2025-07-03  5:48 UTC (permalink / raw)
  To: Ulf Hansson, linux-mmc; +Cc: Avri Altman, Markus Elfring

Simplify memory cleanup by removing redundant NULL checks before calling
free() on pointers. Markus suggested it following static analysis by
Coccinelle.

Suggested-by: Markus Elfring <Markus.Elfring@web.de>
Signed-off-by: Avri Altman <avri.altman@sandisk.com>
---
 mmc_cmds.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mmc_cmds.c b/mmc_cmds.c
index 7994223..b16ac69 100644
--- a/mmc_cmds.c
+++ b/mmc_cmds.c
@@ -3421,8 +3421,7 @@ static int __do_ffu(int nargs, char **argv, enum ffu_download_mode ffu_mode)
 		fprintf(stderr, "FFU finished successfully\n");
 
 out:
-	if (fw_buf)
-		free(fw_buf);
+	free(fw_buf);
 	close(img_fd);
 	close(dev_fd);
 	return ret;
@@ -3651,10 +3650,8 @@ int do_alt_boot_op(int nargs, char **argv)
 	ret = 0;
 
 alloced_error:
-	if (mioc)
-		free(mioc);
-	if (boot_buf)
-		free(boot_buf);
+	free(mioc);
+	free(boot_buf);
 boot_data_close:
 	close(boot_data_fd);
 dev_fd_close:
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mmc-utils: Remove unnecessary null pointer checks
  2025-07-03  5:48 [PATCH] mmc-utils: Remove unnecessary null pointer checks Avri Altman
@ 2025-07-03 14:17 ` Ulf Hansson
  0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2025-07-03 14:17 UTC (permalink / raw)
  To: Avri Altman; +Cc: linux-mmc, Markus Elfring

On Thu, 3 Jul 2025 at 07:49, Avri Altman <avri.altman@sandisk.com> wrote:
>
> Simplify memory cleanup by removing redundant NULL checks before calling
> free() on pointers. Markus suggested it following static analysis by
> Coccinelle.
>
> Suggested-by: Markus Elfring <Markus.Elfring@web.de>
> Signed-off-by: Avri Altman <avri.altman@sandisk.com>

Applied for mmc-utils master, thanks!

Kind regards
Uffe


> ---
>  mmc_cmds.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/mmc_cmds.c b/mmc_cmds.c
> index 7994223..b16ac69 100644
> --- a/mmc_cmds.c
> +++ b/mmc_cmds.c
> @@ -3421,8 +3421,7 @@ static int __do_ffu(int nargs, char **argv, enum ffu_download_mode ffu_mode)
>                 fprintf(stderr, "FFU finished successfully\n");
>
>  out:
> -       if (fw_buf)
> -               free(fw_buf);
> +       free(fw_buf);
>         close(img_fd);
>         close(dev_fd);
>         return ret;
> @@ -3651,10 +3650,8 @@ int do_alt_boot_op(int nargs, char **argv)
>         ret = 0;
>
>  alloced_error:
> -       if (mioc)
> -               free(mioc);
> -       if (boot_buf)
> -               free(boot_buf);
> +       free(mioc);
> +       free(boot_buf);
>  boot_data_close:
>         close(boot_data_fd);
>  dev_fd_close:
> --
> 2.34.1
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-07-03 14:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-03  5:48 [PATCH] mmc-utils: Remove unnecessary null pointer checks Avri Altman
2025-07-03 14:17 ` Ulf Hansson

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).