2022-06-06 13:00:53

by Ziyang Xuan (William)

Subject: [PATCH] hwmon: (occ) Delete unnecessary NULL check

kvfree(NULL) is safe. NULL check before kvfree() is not needed.
Delete them to simplify the code.

Generated by coccinelle script:
scripts/coccinelle/free/ifnullfree.cocci

Signed-off-by: Ziyang Xuan <[email protected]>
---
drivers/hwmon/occ/p9_sbe.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/hwmon/occ/p9_sbe.c b/drivers/hwmon/occ/p9_sbe.c
index 42fc7b97bb34..01405ae2f9bd 100644
--- a/drivers/hwmon/occ/p9_sbe.c
+++ b/drivers/hwmon/occ/p9_sbe.c
@@ -55,8 +55,7 @@ static bool p9_sbe_occ_save_ffdc(struct p9_sbe_occ *ctx, const void *resp,
mutex_lock(&ctx->sbe_error_lock);
if (!ctx->sbe_error) {
if (resp_len > ctx->ffdc_size) {
- if (ctx->ffdc)
- kvfree(ctx->ffdc);
+ kvfree(ctx->ffdc);
ctx->ffdc = kvmalloc(resp_len, GFP_KERNEL);
if (!ctx->ffdc) {
ctx->ffdc_len = 0;
@@ -171,8 +170,7 @@ static int p9_sbe_occ_remove(struct platform_device *pdev)
ctx->sbe = NULL;
occ_shutdown(occ);

- if (ctx->ffdc)
- kvfree(ctx->ffdc);
+ kvfree(ctx->ffdc);

return 0;
}
--
2.25.1

2022-06-06 13:45:54

by Eddie James

Subject: Re: [PATCH] hwmon: (occ) Delete unnecessary NULL check

On 6/6/22 08:14, Ziyang Xuan wrote:
> kvfree(NULL) is safe. NULL check before kvfree() is not needed.
> Delete them to simplify the code.
>
> Generated by coccinelle script:
> scripts/coccinelle/free/ifnullfree.cocci


Thanks for the patch!

Reviewed-by: Eddie James <[email protected]>


>
> Signed-off-by: Ziyang Xuan <[email protected]>
> ---
> drivers/hwmon/occ/p9_sbe.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/occ/p9_sbe.c b/drivers/hwmon/occ/p9_sbe.c
> index 42fc7b97bb34..01405ae2f9bd 100644
> --- a/drivers/hwmon/occ/p9_sbe.c
> +++ b/drivers/hwmon/occ/p9_sbe.c
> @@ -55,8 +55,7 @@ static bool p9_sbe_occ_save_ffdc(struct p9_sbe_occ *ctx, const void *resp,
> mutex_lock(&ctx->sbe_error_lock);
> if (!ctx->sbe_error) {
> if (resp_len > ctx->ffdc_size) {
> - if (ctx->ffdc)
> - kvfree(ctx->ffdc);
> + kvfree(ctx->ffdc);
> ctx->ffdc = kvmalloc(resp_len, GFP_KERNEL);
> if (!ctx->ffdc) {
> ctx->ffdc_len = 0;
> @@ -171,8 +170,7 @@ static int p9_sbe_occ_remove(struct platform_device *pdev)
> ctx->sbe = NULL;
> occ_shutdown(occ);
>
> - if (ctx->ffdc)
> - kvfree(ctx->ffdc);
> + kvfree(ctx->ffdc);
>
> return 0;
> }

2022-06-06 14:31:32

by Guenter Roeck

Subject: Re: [PATCH] hwmon: (occ) Delete unnecessary NULL check

On Mon, Jun 06, 2022 at 09:14:01PM +0800, Ziyang Xuan wrote:
> kvfree(NULL) is safe. NULL check before kvfree() is not needed.
> Delete them to simplify the code.
>
> Generated by coccinelle script:
> scripts/coccinelle/free/ifnullfree.cocci
>
> Signed-off-by: Ziyang Xuan <[email protected]>

Applied to hwmon-next.

Thanks,
Guenter

> ---
> drivers/hwmon/occ/p9_sbe.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/occ/p9_sbe.c b/drivers/hwmon/occ/p9_sbe.c
> index 42fc7b97bb34..01405ae2f9bd 100644
> --- a/drivers/hwmon/occ/p9_sbe.c
> +++ b/drivers/hwmon/occ/p9_sbe.c
> @@ -55,8 +55,7 @@ static bool p9_sbe_occ_save_ffdc(struct p9_sbe_occ *ctx, const void *resp,
> mutex_lock(&ctx->sbe_error_lock);
> if (!ctx->sbe_error) {
> if (resp_len > ctx->ffdc_size) {
> - if (ctx->ffdc)
> - kvfree(ctx->ffdc);
> + kvfree(ctx->ffdc);
> ctx->ffdc = kvmalloc(resp_len, GFP_KERNEL);
> if (!ctx->ffdc) {
> ctx->ffdc_len = 0;
> @@ -171,8 +170,7 @@ static int p9_sbe_occ_remove(struct platform_device *pdev)
> ctx->sbe = NULL;
> occ_shutdown(occ);
>
> - if (ctx->ffdc)
> - kvfree(ctx->ffdc);
> + kvfree(ctx->ffdc);
>
> return 0;
> }
> --
> 2.25.1
>