2023-08-01 10:14:56

by Ran Sun

Subject: [PATCH] drm/amd/pm/powerplay/hwmgr/hwmgr: Clean up errors in hwmgr.c

Fix the following errors reported by checkpatch:

ERROR: space prohibited after that '~' (ctx:WxW)
ERROR: spaces required around that '||' (ctx:VxW)

Signed-off-by: Ran Sun <[email protected]>
---
drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
index f2cef0930aa9..2b5ac21fee39 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
@@ -120,7 +120,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)
case CHIP_TOPAZ:
hwmgr->smumgr_funcs = &iceland_smu_funcs;
topaz_set_asic_special_caps(hwmgr);
- hwmgr->feature_mask &= ~ (PP_VBI_TIME_SUPPORT_MASK |
+ hwmgr->feature_mask &= ~(PP_VBI_TIME_SUPPORT_MASK |
PP_ENABLE_GFX_CG_THRU_SMU);
hwmgr->pp_table_version = PP_TABLE_V0;
hwmgr->od_enabled = false;
@@ -133,7 +133,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)
case CHIP_FIJI:
hwmgr->smumgr_funcs = &fiji_smu_funcs;
fiji_set_asic_special_caps(hwmgr);
- hwmgr->feature_mask &= ~ (PP_VBI_TIME_SUPPORT_MASK |
+ hwmgr->feature_mask &= ~(PP_VBI_TIME_SUPPORT_MASK |
PP_ENABLE_GFX_CG_THRU_SMU);
break;
case CHIP_POLARIS11:
@@ -195,7 +195,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)

int hwmgr_sw_init(struct pp_hwmgr *hwmgr)
{
- if (!hwmgr|| !hwmgr->smumgr_funcs || !hwmgr->smumgr_funcs->smu_init)
+ if (!hwmgr || !hwmgr->smumgr_funcs || !hwmgr->smumgr_funcs->smu_init)
return -EINVAL;

phm_register_irq_handlers(hwmgr);
--
2.17.1

2023-08-07 19:23:11

by Alex Deucher

Subject: Re: [PATCH] drm/amd/pm/powerplay/hwmgr/hwmgr: Clean up errors in hwmgr.c

Applied. Thanks!

On Tue, Aug 1, 2023 at 5:37 AM Ran Sun <[email protected]> wrote:
>
> Fix the following errors reported by checkpatch:
>
> ERROR: space prohibited after that '~' (ctx:WxW)
> ERROR: spaces required around that '||' (ctx:VxW)
>
> Signed-off-by: Ran Sun <[email protected]>
> ---
> drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
> index f2cef0930aa9..2b5ac21fee39 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
> @@ -120,7 +120,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)
> case CHIP_TOPAZ:
> hwmgr->smumgr_funcs = &iceland_smu_funcs;
> topaz_set_asic_special_caps(hwmgr);
> - hwmgr->feature_mask &= ~ (PP_VBI_TIME_SUPPORT_MASK |
> + hwmgr->feature_mask &= ~(PP_VBI_TIME_SUPPORT_MASK |
> PP_ENABLE_GFX_CG_THRU_SMU);
> hwmgr->pp_table_version = PP_TABLE_V0;
> hwmgr->od_enabled = false;
> @@ -133,7 +133,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)
> case CHIP_FIJI:
> hwmgr->smumgr_funcs = &fiji_smu_funcs;
> fiji_set_asic_special_caps(hwmgr);
> - hwmgr->feature_mask &= ~ (PP_VBI_TIME_SUPPORT_MASK |
> + hwmgr->feature_mask &= ~(PP_VBI_TIME_SUPPORT_MASK |
> PP_ENABLE_GFX_CG_THRU_SMU);
> break;
> case CHIP_POLARIS11:
> @@ -195,7 +195,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)
>
> int hwmgr_sw_init(struct pp_hwmgr *hwmgr)
> {
> - if (!hwmgr|| !hwmgr->smumgr_funcs || !hwmgr->smumgr_funcs->smu_init)
> + if (!hwmgr || !hwmgr->smumgr_funcs || !hwmgr->smumgr_funcs->smu_init)
> return -EINVAL;
>
> phm_register_irq_handlers(hwmgr);
> --
> 2.17.1
>