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

Jani Nikula jani.nikula at linux.intel.com
Thu Aug 31 06:30:05 UTC 2017


On Wed, 30 Aug 2017, Himanshu Jha <himanshujha199640 at 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 at 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


More information about the Intel-gfx mailing list