drm/amd/display: Remove redundant NULL check before kfree in mod_power_create()
Subsystems (3)
PATCH 1/1 drm/amd/display: Remove redundant NULL check before kfree in mod_power_create()
kfree() safely handles NULL pointers, so there is no need to check for NULL before calling kfree().
Remove redundant NULL check.
Found by Coccinelle ifnullfree script.
--- drivers/gpu/drm/amd/display/modules/power/power.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power.c +4 -8
@@ -270,12 +270,10 @@ struct mod_power *mod_power_create(struct dc *dc, fail_bad_brightness_range: fail_alloc_backlight_array:for (inst =0 ; inst < edp_num; inst++) -if (core_power->bl_prop[inst].backlight_lut) -kfree (core_power->bl_prop[inst].backlight_lut); +kfree (core_power->bl_prop[inst].backlight_lut); fail_construct:for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) { -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); +kfree (core_power->map[i].psr_context); }kfree (core_power->map);
@@ -295,8 +293,7 @@ void mod_power_destroy(struct mod_power *mod_power)MOD_POWER_TO_CORE (mod_power);for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); +kfree (core_power->map[i].psr_context);for (i =0 ; i < core_power->num_entities; i++)if (core_power->map[i].stream)
@@ -305,8 +302,7 @@ void mod_power_destroy(struct mod_power *mod_power)kfree (core_power->map);for (i =0 ; i <MAX_NUM_EDP ; i++) -if (core_power->bl_prop[i].backlight_lut) -kfree (core_power->bl_prop[i].backlight_lut); +kfree (core_power->bl_prop[i].backlight_lut);kfree (core_power); }
Signature · 1 line
2.43.0
Re: [PATCH] drm/amd/display: Remove redundant NULL check before kfree() in mod_power_create()
…
Quoted 3 lines
+++
b/drivers/gpu/drm/amd/display/modules/power/power.cdrivers/gpu/drm/amd/display/modules/power/power.c +0
-0@@ -270,12 +270,10 @@ struct mod_power *mod_power_create(struct dc *dc, fail_bad_brightness_range:
…
drivers/gpu/drm/amd/display/modules/power/power.c struct mod_power *mod_power_create(struct dc *dc, · line 277
Quoted 6 lines
fail_construct:drivers/gpu/drm/amd/display/modules/power/power.c +1
-2for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) { -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); +kfree (core_power->map[i].psr_context); }
May curly brackets be omitted here?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?h=v7.1#n197
Regards,
Markus
Re: [PATCH] drm/amd/display: Remove redundant NULL check before kfree() in mod_power_create()
Quoted 15 lines · Markus Elfring
…
Quoted 3 lines
+++
b/drivers/gpu/drm/amd/display/modules/power/power.cdrivers/gpu/drm/amd/display/modules/power/power.c +0
-0@@ -270,12 +270,10 @@ struct mod_power *mod_power_create(struct dc *dc, fail_bad_brightness_range:…
drivers/gpu/drm/amd/display/modules/power/power.c struct mod_power *mod_power_create(struct dc *dc, · line 277
Quoted 6 lines
fail_construct:drivers/gpu/drm/amd/display/modules/power/power.c +1
-2for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) { -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); +kfree (core_power->map[i].psr_context); }May curly brackets be omitted here?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?h=v7.1#n197
Quoted 2 lines
Regards,
Markus
Yes, you're right. I will send a v2 with this fixed.
Regards,
Ziran Zhang
PATCH v2 1/1 drm/amd/display: Remove redundant NULL check before kfree in mod_power_create()
In reply to Ziran Zhangkfree() safely handles NULL pointers, so there is no need to check for NULL before calling kfree().
Remove redundant NULL check.
Found by Coccinelle ifnullfree script.
---
Changes in v2:
- Remove unnecessary brackets.
.../gpu/drm/amd/display/modules/power/power.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power.c +6 -10
@@ -270,13 +270,11 @@ struct mod_power *mod_power_create(struct dc *dc, fail_bad_brightness_range: fail_alloc_backlight_array:for (inst =0 ; inst < edp_num; inst++) -if (core_power->bl_prop[inst].backlight_lut) -kfree (core_power->bl_prop[inst].backlight_lut); +kfree (core_power->bl_prop[inst].backlight_lut); fail_construct: -for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) { -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); - } +for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) +kfree (core_power->map[i].psr_context); +kfree (core_power->map); fail_alloc_map:
@@ -295,8 +293,7 @@ void mod_power_destroy(struct mod_power *mod_power)MOD_POWER_TO_CORE (mod_power);for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); +kfree (core_power->map[i].psr_context);for (i =0 ; i < core_power->num_entities; i++)if (core_power->map[i].stream)
@@ -305,8 +302,7 @@ void mod_power_destroy(struct mod_power *mod_power)kfree (core_power->map);for (i =0 ; i <MAX_NUM_EDP ; i++) -if (core_power->bl_prop[i].backlight_lut) -kfree (core_power->bl_prop[i].backlight_lut); +kfree (core_power->bl_prop[i].backlight_lut);kfree (core_power); }
Signature · 1 line
2.43.0
Quoted 2 lines
kfree()safely handles NULL pointers, so there is no need to check for NULL before callingkfree().
…
How do you think about to append parentheses to another function name in the summary phrase?
Regards,
Markus
Re: [PATCH] drm/amd/display: Remove redundant NULL check before kfree() in mod_power_create()
Quoted 9 lines · Markus Elfring
Quoted 2 lines
kfree()safely handles NULL pointers, so there is no need to check for NULL before callingkfree().…
How do you think about to append parentheses to another function name in the summary phrase?
Regards,
Markus
Oops! I will send a v3.
Thanks for the review!
Regards,
Ziran Zhang
PATCH v3 1/1 drm/amd/display: Remove redundant NULL check before kfree() in mod_power_create()
In reply to Ziran Zhangkfree() safely handles NULL pointers, so there is no need to check for NULL before calling kfree().
Remove redundant NULL check.
Found by Coccinelle ifnullfree script.
---
Changes in v3:
- Add parentheses to "kfree" in subject line for consistency.
.../gpu/drm/amd/display/modules/power/power.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power.c +6 -10
@@ -270,13 +270,11 @@ struct mod_power *mod_power_create(struct dc *dc, fail_bad_brightness_range: fail_alloc_backlight_array:for (inst =0 ; inst < edp_num; inst++) -if (core_power->bl_prop[inst].backlight_lut) -kfree (core_power->bl_prop[inst].backlight_lut); +kfree (core_power->bl_prop[inst].backlight_lut); fail_construct: -for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) { -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); - } +for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) +kfree (core_power->map[i].psr_context); +kfree (core_power->map); fail_alloc_map:
@@ -295,8 +293,7 @@ void mod_power_destroy(struct mod_power *mod_power)MOD_POWER_TO_CORE (mod_power);for (i =0 ; i <MOD_POWER_MAX_CONCURRENT_STREAMS ; i++) -if (core_power->map[i].psr_context) -kfree (core_power->map[i].psr_context); +kfree (core_power->map[i].psr_context);for (i =0 ; i < core_power->num_entities; i++)if (core_power->map[i].stream)
@@ -305,8 +302,7 @@ void mod_power_destroy(struct mod_power *mod_power)kfree (core_power->map);for (i =0 ; i <MAX_NUM_EDP ; i++) -if (core_power->bl_prop[i].backlight_lut) -kfree (core_power->bl_prop[i].backlight_lut); +kfree (core_power->bl_prop[i].backlight_lut);kfree (core_power); }
Signature · 1 line
2.43.0