[PATCH 2/3] drm/amdgpu/powerplay: Use swap() where appropriate

[Alex Deucher]

On Thu, Oct 10, 2019 at 9:12 AM Ville Syrjala
<ville.syrjala at linux.intel.com> wrote:
>
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> @swap@
> identifier TEMP;
> expression A,B;
> @@
> - TEMP = A;
> - A = B;
> - B = TEMP;
> + swap(A, B);
>
> @@
> type T;
> identifier swap.TEMP;
> @@
> (
> - T TEMP;
> |
> - T TEMP = {...};
> )
> ... when != TEMP
>
> Cc: Rex Zhu <rex.zhu at amd.com>
> Cc: Evan Quan <evan.quan at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Cc: "Christian König" <christian.koenig at amd.com>
> Cc: "David (ChunMing) Zhou" <David1.Zhou at amd.com>
> Cc: amd-gfx at lists.freedesktop.org
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed and applied.  Thanks!

Alex

> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 6 ++----
>  drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 6 ++----
>  2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
> index 34f95e0e3ea4..1fe992835a76 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
> @@ -1994,7 +1994,6 @@ static int smu7_sort_lookup_table(struct pp_hwmgr *hwmgr,
>                 struct phm_ppt_v1_voltage_lookup_table *lookup_table)
>  {
>         uint32_t table_size, i, j;
> -       struct phm_ppt_v1_voltage_lookup_record tmp_voltage_lookup_record;
>         table_size = lookup_table->count;
>
>         PP_ASSERT_WITH_CODE(0 != lookup_table->count,
> @@ -2005,9 +2004,8 @@ static int smu7_sort_lookup_table(struct pp_hwmgr *hwmgr,
>                 for (j = i + 1; j > 0; j--) {
>                         if (lookup_table->entries[j].us_vdd <
>                                         lookup_table->entries[j - 1].us_vdd) {
> -                               tmp_voltage_lookup_record = lookup_table->entries[j - 1];
> -                               lookup_table->entries[j - 1] = lookup_table->entries[j];
> -                               lookup_table->entries[j] = tmp_voltage_lookup_record;
> +                               swap(lookup_table->entries[j - 1],
> +                                    lookup_table->entries[j]);
>                         }
>                 }
>         }
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> index d08493b67b67..f5dcba44f74a 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> @@ -712,7 +712,6 @@ static int vega10_sort_lookup_table(struct pp_hwmgr *hwmgr,
>                 struct phm_ppt_v1_voltage_lookup_table *lookup_table)
>  {
>         uint32_t table_size, i, j;
> -       struct phm_ppt_v1_voltage_lookup_record tmp_voltage_lookup_record;
>
>         PP_ASSERT_WITH_CODE(lookup_table && lookup_table->count,
>                 "Lookup table is empty", return -EINVAL);
> @@ -724,9 +723,8 @@ static int vega10_sort_lookup_table(struct pp_hwmgr *hwmgr,
>                 for (j = i + 1; j > 0; j--) {
>                         if (lookup_table->entries[j].us_vdd <
>                                         lookup_table->entries[j - 1].us_vdd) {
> -                               tmp_voltage_lookup_record = lookup_table->entries[j - 1];
> -                               lookup_table->entries[j - 1] = lookup_table->entries[j];
> -                               lookup_table->entries[j] = tmp_voltage_lookup_record;
> +                               swap(lookup_table->entries[j - 1],
> +                                    lookup_table->entries[j]);
>                         }
>                 }
>         }
> --
> 2.21.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx