drm/amd/powerplay: better namings

And some minor changes as dropping unused parameter and label
internal used API as static.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 17e246b..71bc4df 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -638,7 +638,7 @@ failed:
        return ret;
 }
 
-int smu_feature_init_dpm(struct smu_context *smu)
+static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)
 {
        struct smu_feature *feature = &smu->smu_feature;
        int ret = 0;
@@ -662,7 +662,6 @@ int smu_feature_init_dpm(struct smu_context *smu)
        return ret;
 }
 
-
 int smu_feature_is_enabled(struct smu_context *smu, enum smu_feature_mask mask)
 {
        struct smu_feature *feature = &smu->smu_feature;
@@ -1115,8 +1114,7 @@ static int smu_sw_fini(void *handle)
        return 0;
 }
 
-static int smu_smc_table_hw_init(struct smu_context *smu,
-                                bool initialize)
+static int smu_smc_hw_setup(struct smu_context *smu)
 {
        struct amdgpu_device *adev = smu->adev;
        int ret;
@@ -1287,11 +1285,11 @@ static int smu_hw_init(void *handle)
        if (ret)
                return ret;
 
-       ret = smu_feature_init_dpm(smu);
+       ret = smu_get_driver_allowed_feature_mask(smu);
        if (ret)
                goto failed;
 
-       ret = smu_smc_table_hw_init(smu, true);
+       ret = smu_smc_hw_setup(smu);
        if (ret)
                goto failed;
 
@@ -1487,7 +1485,7 @@ static int smu_resume(void *handle)
                goto failed;
        }
 
-       ret = smu_smc_table_hw_init(smu, false);
+       ret = smu_smc_hw_setup(smu);
        if (ret)
                goto failed;
 

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index c9a5c57..caefe24 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -654,8 +654,6 @@ extern const struct amd_ip_funcs smu_ip_funcs;
 extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;
 extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;
 
-extern int smu_feature_init_dpm(struct smu_context *smu);
-
 extern int smu_feature_is_enabled(struct smu_context *smu,
                                  enum smu_feature_mask mask);
 extern int smu_feature_set_enabled(struct smu_context *smu,