Skip to content

Commit

Permalink
drm/amd/powerplay: drop unneeded newline
Browse files Browse the repository at this point in the history
PP_ASSERT_WITH_CODE prints a newline at the end of the message string,
so the message string does not need to include a newline explicitly.
Done using Coccinelle.

Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
  • Loading branch information
JuliaLawall authored and alexdeucher committed Feb 19, 2018
1 parent 933519a commit 1446413
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
12 changes: 8 additions & 4 deletions drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -2266,14 +2266,18 @@ static int smu7_set_private_data_based_on_pptable_v0(struct pp_hwmgr *hwmgr)
struct phm_clock_voltage_dependency_table *allowed_mclk_vddci_table = hwmgr->dyn_state.vddci_dependency_on_mclk;

PP_ASSERT_WITH_CODE(allowed_sclk_vddc_table != NULL,
"VDDC dependency on SCLK table is missing. This table is mandatory\n", return -EINVAL);
"VDDC dependency on SCLK table is missing. This table is mandatory",
return -EINVAL);
PP_ASSERT_WITH_CODE(allowed_sclk_vddc_table->count >= 1,
"VDDC dependency on SCLK table has to have is missing. This table is mandatory\n", return -EINVAL);
"VDDC dependency on SCLK table has to have is missing. This table is mandatory",
return -EINVAL);

PP_ASSERT_WITH_CODE(allowed_mclk_vddc_table != NULL,
"VDDC dependency on MCLK table is missing. This table is mandatory\n", return -EINVAL);
"VDDC dependency on MCLK table is missing. This table is mandatory",
return -EINVAL);
PP_ASSERT_WITH_CODE(allowed_mclk_vddc_table->count >= 1,
"VDD dependency on MCLK table has to have is missing. This table is mandatory\n", return -EINVAL);
"VDD dependency on MCLK table has to have is missing. This table is mandatory",
return -EINVAL);

data->min_vddc_in_pptable = (uint16_t)allowed_sclk_vddc_table->entries[0].v;
data->max_vddc_in_pptable = (uint16_t)allowed_sclk_vddc_table->entries[allowed_sclk_vddc_table->count - 1].v;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1799,7 +1799,7 @@ static int fiji_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
PHM_PlatformCaps_ClockStretcher);
PP_ASSERT_WITH_CODE(false,
"Stretch Amount in PPTable not supported\n",
"Stretch Amount in PPTable not supported",
return -EINVAL);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,

/* SCLK/VDDC Dependency Table has to exist. */
PP_ASSERT_WITH_CODE(NULL != hwmgr->dyn_state.vddc_dependency_on_sclk,
"The SCLK/VDDC Dependency Table does not exist.\n",
"The SCLK/VDDC Dependency Table does not exist.",
return -EINVAL);

if (NULL == hwmgr->dyn_state.cac_leakage_table) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,7 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
PHM_PlatformCaps_ClockStretcher);
PP_ASSERT_WITH_CODE(false,
"Stretch Amount in PPTable not supported\n",
"Stretch Amount in PPTable not supported",
return -EINVAL);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1699,7 +1699,7 @@ static int tonga_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
PHM_PlatformCaps_ClockStretcher);
PP_ASSERT_WITH_CODE(false,
"Stretch Amount in PPTable not supported\n",
"Stretch Amount in PPTable not supported",
return -EINVAL);
}

Expand Down

0 comments on commit 1446413

Please sign in to comment.