Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1723344 > unrolled thread

[PATCH] drm/i915/opregion: Remove null check before kfree

Started byHimanshu Jha <himanshujha199640@gmail.com>
First post2017-08-30 15:40 +0200
Last post2017-08-31 08:40 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] drm/i915/opregion: Remove null check before kfree Himanshu Jha <himanshujha199640@gmail.com> - 2017-08-30 15:40 +0200
    Re: [PATCH] drm/i915/opregion: Remove null check before kfree Jani Nikula <jani.nikula@linux.intel.com> - 2017-08-31 08:40 +0200

#1723344 — [PATCH] drm/i915/opregion: Remove null check before kfree

FromHimanshu Jha <himanshujha199640@gmail.com>
Date2017-08-30 15:40 +0200
Subject[PATCH] drm/i915/opregion: Remove null check before kfree
Message-ID<ukbnR-rR-29@gated-at.bofh.it>
kfree on NULL pointer is a no-op and therefore checking is redundant.

Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
---
 drivers/gpu/drm/i915/intel_opregion.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 98154ef..2427b40 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -830,10 +830,8 @@ void intel_opregion_unregister(struct drm_i915_private *dev_priv)
 		memunmap(opregion->rvda);
 		opregion->rvda = NULL;
 	}
-	if (opregion->vbt_firmware) {
-		kfree(opregion->vbt_firmware);
-		opregion->vbt_firmware = NULL;
-	}
+	kfree(opregion->vbt_firmware);
+	opregion->vbt_firmware = NULL;
 	opregion->header = NULL;
 	opregion->acpi = NULL;
 	opregion->swsci = NULL;
-- 
2.7.4

[toc] | [next] | [standalone]


#1723865

FromJani Nikula <jani.nikula@linux.intel.com>
Date2017-08-31 08:40 +0200
Message-ID<ukriV-288-1@gated-at.bofh.it>
In reply to#1723344
On Wed, 30 Aug 2017, Himanshu Jha <himanshujha199640@gmail.com> wrote:
> kfree on NULL pointer is a no-op and therefore checking is redundant.

IMO the code has more clarity as it is.

BR,
Jani.

>
> Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 98154ef..2427b40 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -830,10 +830,8 @@ void intel_opregion_unregister(struct drm_i915_private *dev_priv)
>  		memunmap(opregion->rvda);
>  		opregion->rvda = NULL;
>  	}
> -	if (opregion->vbt_firmware) {
> -		kfree(opregion->vbt_firmware);
> -		opregion->vbt_firmware = NULL;
> -	}
> +	kfree(opregion->vbt_firmware);
> +	opregion->vbt_firmware = NULL;
>  	opregion->header = NULL;
>  	opregion->acpi = NULL;
>  	opregion->swsci = NULL;

-- 
Jani Nikula, Intel Open Source Technology Center

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web