Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Remove redundant calls of amdgpu_ras_block_late_fini in mca 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>

authored by

yipechai and committed by
Alex Deucher
30e58102 149d7ba1

+3 -27
-6
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
··· 70 70 71 71 amdgpu_mca_reset_error_count(adev, mc_status_addr); 72 72 } 73 - 74 - void amdgpu_mca_ras_fini(struct amdgpu_device *adev, 75 - struct amdgpu_mca_ras *mca_dev) 76 - { 77 - amdgpu_ras_block_late_fini(adev, mca_dev->ras_if); 78 - }
-3
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h
··· 56 56 uint64_t mc_status_addr, 57 57 void *ras_error_status); 58 58 59 - void amdgpu_mca_ras_fini(struct amdgpu_device *adev, 60 - struct amdgpu_mca_ras *mca_dev); 61 - 62 59 #endif
+3 -18
drivers/gpu/drm/amd/amdgpu/mca_v3_0.c
··· 37 37 ras_error_status); 38 38 } 39 39 40 - static void mca_v3_0_mp0_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block) 41 - { 42 - amdgpu_mca_ras_fini(adev, &adev->mca.mp0); 43 - } 44 - 45 40 static int mca_v3_0_ras_block_match(struct amdgpu_ras_block_object *block_obj, 46 41 enum amdgpu_ras_block block, uint32_t sub_block_index) 47 42 { ··· 66 71 }, 67 72 .hw_ops = &mca_v3_0_mp0_hw_ops, 68 73 .ras_block_match = mca_v3_0_ras_block_match, 69 - .ras_fini = mca_v3_0_mp0_ras_fini, 74 + .ras_fini = amdgpu_ras_block_late_fini, 70 75 }, 71 76 }; 72 77 ··· 76 81 amdgpu_mca_query_ras_error_count(adev, 77 82 smnMCMP1_STATUST0, 78 83 ras_error_status); 79 - } 80 - 81 - static void mca_v3_0_mp1_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block) 82 - { 83 - amdgpu_mca_ras_fini(adev, &adev->mca.mp1); 84 84 } 85 85 86 86 const struct amdgpu_ras_block_hw_ops mca_v3_0_mp1_hw_ops = { ··· 93 103 }, 94 104 .hw_ops = &mca_v3_0_mp1_hw_ops, 95 105 .ras_block_match = mca_v3_0_ras_block_match, 96 - .ras_fini = mca_v3_0_mp1_ras_fini, 106 + .ras_fini = amdgpu_ras_block_late_fini, 97 107 }, 98 108 }; 99 109 ··· 103 113 amdgpu_mca_query_ras_error_count(adev, 104 114 smnMCMPIO_STATUST0, 105 115 ras_error_status); 106 - } 107 - 108 - static void mca_v3_0_mpio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block) 109 - { 110 - amdgpu_mca_ras_fini(adev, &adev->mca.mpio); 111 116 } 112 117 113 118 const struct amdgpu_ras_block_hw_ops mca_v3_0_mpio_hw_ops = { ··· 120 135 }, 121 136 .hw_ops = &mca_v3_0_mpio_hw_ops, 122 137 .ras_block_match = mca_v3_0_ras_block_match, 123 - .ras_fini = mca_v3_0_mpio_ras_fini, 138 + .ras_fini = amdgpu_ras_block_late_fini, 124 139 }, 125 140 }; 126 141