[1/3] drm/amd/powerplay/hwmgr: Delete an error message for a failed memory allocation in three functions

Commit Message

SF Markus Elfring Feb. 8, 2018, 8:43 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Thu, 8 Feb 2018 20:32:39 +0100

Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 4 +---
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c    | 1 -
 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

Patch

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
index b314d09d41af..c0699b884894 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
@@ -286,10 +286,8 @@  static int cz_init_dynamic_state_adjustment_rule_settings(
 	struct phm_clock_voltage_dependency_table *table_clk_vlt =
 					kzalloc(table_size, GFP_KERNEL);
 
-	if (NULL == table_clk_vlt) {
-		pr_err("Can not allocate memory!\n");
+	if (!table_clk_vlt)
 		return -ENOMEM;
-	}
 
 	table_clk_vlt->count = 8;
 	table_clk_vlt->entries[0].clk = PP_DAL_POWERLEVEL_0;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 0229f774f7a9..ded33ed03f11 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -815,7 +815,6 @@  int phm_initializa_dynamic_state_adjustment_rule_settings(struct pp_hwmgr *hwmgr
 	table_clk_vlt = kzalloc(table_size, GFP_KERNEL);
 
 	if (NULL == table_clk_vlt) {
-		pr_err("Can not allocate space for vddc_dep_on_dal_pwrl! \n");
 		return -ENOMEM;
 	} else {
 		table_clk_vlt->count = 4;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
index 569073e3a5a1..967b93e56113 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
@@ -107,10 +107,8 @@  static int rv_init_dynamic_state_adjustment_rule_settings(
 	struct phm_clock_voltage_dependency_table *table_clk_vlt =
 					kzalloc(table_size, GFP_KERNEL);
 
-	if (NULL == table_clk_vlt) {
-		pr_err("Can not allocate memory!\n");
+	if (!table_clk_vlt)
 		return -ENOMEM;
-	}
 
 	table_clk_vlt->count = 8;
 	table_clk_vlt->entries[0].clk = PP_DAL_POWERLEVEL_0;