[PATCH] drm/amd/pm: Clean up errors in amd_powerplay.c

Alex Deucher alexdeucher at gmail.com
Mon Aug 7 16:24:11 UTC 2023


Applied.  Thanks!

On Mon, Jul 31, 2023 at 10:37 PM Ran Sun <sunran001 at 208suo.com> wrote:
>
> Fix the following errors reported by checkpatch:
>
> ERROR: that open brace { should be on the previous line
> ERROR: spaces required around that '||' (ctx:WxO)
>
> Signed-off-by: Ran Sun <sunran001 at 208suo.com>
> ---
>  drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> index ff360c699171..9e4f8a4104a3 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> @@ -612,7 +612,7 @@ static int pp_dpm_get_pp_num_states(void *handle,
>
>         memset(data, 0, sizeof(*data));
>
> -       if (!hwmgr || !hwmgr->pm_en ||!hwmgr->ps)
> +       if (!hwmgr || !hwmgr->pm_en || !hwmgr->ps)
>                 return -EINVAL;
>
>         data->nums = hwmgr->num_ps;
> @@ -644,7 +644,7 @@ static int pp_dpm_get_pp_table(void *handle, char **table)
>  {
>         struct pp_hwmgr *hwmgr = handle;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!hwmgr->soft_pp_table)
> +       if (!hwmgr || !hwmgr->pm_en || !hwmgr->soft_pp_table)
>                 return -EINVAL;
>
>         *table = (char *)hwmgr->soft_pp_table;
> @@ -1002,7 +1002,7 @@ static int pp_get_power_limit(void *handle, uint32_t *limit,
>         struct pp_hwmgr *hwmgr = handle;
>         int ret = 0;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!limit)
> +       if (!hwmgr || !hwmgr->pm_en || !limit)
>                 return -EINVAL;
>
>         if (power_type != PP_PWR_TYPE_SUSTAINED)
> @@ -1047,7 +1047,7 @@ static int pp_get_display_power_level(void *handle,
>  {
>         struct pp_hwmgr *hwmgr = handle;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!output)
> +       if (!hwmgr || !hwmgr->pm_en || !output)
>                 return -EINVAL;
>
>         return phm_get_dal_power_level(hwmgr, output);
> @@ -1120,7 +1120,7 @@ static int pp_get_clock_by_type_with_latency(void *handle,
>  {
>         struct pp_hwmgr *hwmgr = handle;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!clocks)
> +       if (!hwmgr || !hwmgr->pm_en || !clocks)
>                 return -EINVAL;
>
>         return phm_get_clock_by_type_with_latency(hwmgr, type, clocks);
> @@ -1132,7 +1132,7 @@ static int pp_get_clock_by_type_with_voltage(void *handle,
>  {
>         struct pp_hwmgr *hwmgr = handle;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!clocks)
> +       if (!hwmgr || !hwmgr->pm_en || !clocks)
>                 return -EINVAL;
>
>         return phm_get_clock_by_type_with_voltage(hwmgr, type, clocks);
> @@ -1155,7 +1155,7 @@ static int pp_display_clock_voltage_request(void *handle,
>  {
>         struct pp_hwmgr *hwmgr = handle;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!clock)
> +       if (!hwmgr || !hwmgr->pm_en || !clock)
>                 return -EINVAL;
>
>         return phm_display_clock_voltage_request(hwmgr, clock);
> @@ -1167,7 +1167,7 @@ static int pp_get_display_mode_validation_clocks(void *handle,
>         struct pp_hwmgr *hwmgr = handle;
>         int ret = 0;
>
> -       if (!hwmgr || !hwmgr->pm_en ||!clocks)
> +       if (!hwmgr || !hwmgr->pm_en || !clocks)
>                 return -EINVAL;
>
>         clocks->level = PP_DAL_POWERLEVEL_7;
> --
> 2.17.1
>


More information about the amd-gfx mailing list