2017-08-30 13:31:33

by Himanshu Jha

Subject: [PATCH] drm/i915/opregion: 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/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

2017-08-31 06:30:20

by Jani Nikula

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

On Wed, 30 Aug 2017, Himanshu Jha <[email protected]> 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 <[email protected]>
> ---
> 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