drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in umc ras block

Remove redundant calls of amdgpu_ras_block_late_fini in umc ras block.

Signed-off-by: yipechai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
index 2623a2d..85da6cb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
@@ -162,13 +162,6 @@ late_fini:
        return r;
 }
 
-void amdgpu_umc_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
-{
-       if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
-                       ras_block)
-               amdgpu_ras_block_late_fini(adev, ras_block);
-}
-
 int amdgpu_umc_process_ecc_irq(struct amdgpu_device *adev,
                struct amdgpu_irq_src *source,
                struct amdgpu_iv_entry *entry)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
index c8deba8..2ec6698 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
@@ -73,7 +73,6 @@ struct amdgpu_umc {
 };
 
 int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
-void amdgpu_umc_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block);
 int amdgpu_umc_poison_handler(struct amdgpu_device *adev,
                void *ras_error_status,
                bool reset);

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 3dcd82b..d4ffe08 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -685,7 +685,7 @@ static void gmc_v10_0_set_umc_funcs(struct amdgpu_device *adev)
 
                /* If don't define special ras_fini function, use default ras_fini */
                if (!adev->umc.ras->ras_block.ras_fini)
-                               adev->umc.ras->ras_block.ras_fini = amdgpu_umc_ras_fini;
+                       adev->umc.ras->ras_block.ras_fini = amdgpu_ras_block_late_fini;
 
                /* If not defined special ras_cb function, use default ras_cb */
                if (!adev->umc.ras->ras_block.ras_cb)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 6beea09..1b7a59e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1245,7 +1245,7 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev)
 
                /* If don't define special ras_fini function, use default ras_fini */
                if (!adev->umc.ras->ras_block.ras_fini)
-                               adev->umc.ras->ras_block.ras_fini = amdgpu_umc_ras_fini;
+                       adev->umc.ras->ras_block.ras_fini = amdgpu_ras_block_late_fini;
 
                /* If not defined special ras_cb function, use default ras_cb */
                if (!adev->umc.ras->ras_block.ras_cb)