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


Groups > linux.kernel > #1444841

[PATCH 2/8] drm/amdgpu/powerplay: Delete unnecessary checks before the function call "kfree"

From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 2/8] drm/amdgpu/powerplay: Delete unnecessary checks before the function call "kfree"
Date 2016-07-16 16:50 +0200
Message-ID <rVz4J-4ZK-1@gated-at.bofh.it> (permalink)
References (14 earlier) <mSsDN-4wa-63@gated-at.bofh.it> <mSsDN-4wa-65@gated-at.bofh.it> <mSsDN-4wa-33@gated-at.bofh.it> <pGgrL-7JT-5@gated-at.bofh.it> <rVyV3-4Wl-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 16 Jul 2016 12:38:12 +0200

The kfree() function tests whether its argument is NULL and then
returns immediately. Thus the test around the calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c              | 3 +--
 drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index cf6f49f..6f11bc1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -1053,8 +1053,7 @@ static int amdgpu_cgs_acpi_eval_object(struct cgs_device *cgs_device,
 	}
 
 error:
-	if (obj != NULL)
-		kfree(obj);
+	kfree(obj);
 	kfree((void *)input.pointer);
 	return result;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
index 7a705ce..024e22e 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
@@ -76,10 +76,7 @@ int phm_dispatch_table(struct pp_hwmgr *hwmgr,
 	}
 
 	result = phm_run_table(hwmgr, rt_table, input, output, temp_storage);
-
-	if (NULL != temp_storage)
-		kfree(temp_storage);
-
+	kfree(temp_storage);
 	return result;
 }
 
-- 
2.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/8] drm/amdgpu: Fine-tuning for three function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 16:40 +0200
  [PATCH 2/8] drm/amdgpu/powerplay: Delete unnecessary checks before  the function call "kfree" SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 16:50 +0200
  [PATCH 1/8] drm/amdgpu: Delete an unnecessary check before  drm_gem_object_unreference_unlocked() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 16:50 +0200
  [PATCH 4/8] drm/amdgpu: Delete a variable in  amdgpu_cgs_acpi_eval_object() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:00 +0200
    [PATCH 5/8] drm/amdgpu: Delete an unnecessary variable initialisation  in amdgpu_cgs_acpi_eval_object() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:00 +0200
  [PATCH 3/8] drm/amdgpu: One function call less in  amdgpu_cgs_acpi_eval_object() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:00 +0200
  [PATCH 6/8] drm/amdgpu: Change assignment for a variable in  amdgpu_cgs_acpi_eval_object() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:10 +0200
  [PATCH 7/8] drm/amd/powerplay: Change assignment for a buffer  variable in phm_dispatch_table() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:10 +0200
    Re: [PATCH 7/8] drm/amd/powerplay: Change assignment for a buffer  variable in phm_dispatch_table() walter harms <wharms@bfs.de> - 2016-07-17 17:10 +0200
  [PATCH 5/8] drm/amdgpu: Delete an unnecessary variable initialisation  in amdgpu_cgs_acpi_eval_object() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:10 +0200
  [PATCH 8/8] drm/amd/powerplay: Delete an unnecessary variable  initialisation in phm_dispatch_table() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-16 17:20 +0200

csiph-web