2017-08-30 13:26:16

by Himanshu Jha

[permalink] [raw]
Subject: [PATCH] drm/gma500: Remove null check before kfree

kfree on NULL pointer is a no-op and therefore checking is redundant.

Signed-off-by: Himanshu Jha <[email protected]>
---
drivers/gpu/drm/gma500/cdv_intel_dp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index c52f9ad..a4bb89b 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1901,10 +1901,8 @@ cdv_intel_dp_destroy(struct drm_connector *connector)

if (is_edp(gma_encoder)) {
/* cdv_intel_panel_destroy_backlight(connector->dev); */
- if (intel_dp->panel_fixed_mode) {
- kfree(intel_dp->panel_fixed_mode);
- intel_dp->panel_fixed_mode = NULL;
- }
+ kfree(intel_dp->panel_fixed_mode);
+ intel_dp->panel_fixed_mode = NULL;
}
i2c_del_adapter(&intel_dp->adapter);
drm_connector_unregister(connector);
--
2.7.4


2017-08-31 07:52:32

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH] drm/gma500: Remove null check before kfree

On Wed, Aug 30, 2017 at 06:55:56PM +0530, Himanshu Jha wrote:
> kfree on NULL pointer is a no-op and therefore checking is redundant.
>
> Signed-off-by: Himanshu Jha <[email protected]>

Applied to drm-misc-next, thanks.
-Daniel

> ---
> drivers/gpu/drm/gma500/cdv_intel_dp.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> index c52f9ad..a4bb89b 100644
> --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
> +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> @@ -1901,10 +1901,8 @@ cdv_intel_dp_destroy(struct drm_connector *connector)
>
> if (is_edp(gma_encoder)) {
> /* cdv_intel_panel_destroy_backlight(connector->dev); */
> - if (intel_dp->panel_fixed_mode) {
> - kfree(intel_dp->panel_fixed_mode);
> - intel_dp->panel_fixed_mode = NULL;
> - }
> + kfree(intel_dp->panel_fixed_mode);
> + intel_dp->panel_fixed_mode = NULL;
> }
> i2c_del_adapter(&intel_dp->adapter);
> drm_connector_unregister(connector);
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch