Commit f578a37d authored by yipechai's avatar yipechai Committed by Alex Deucher

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

Remove redundant calls of amdgpu_ras_block_late_fini in nbio ras block.
Signed-off-by: default avataryipechai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9dad47c5
...@@ -43,10 +43,3 @@ int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if * ...@@ -43,10 +43,3 @@ int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *
amdgpu_ras_block_late_fini(adev, ras_block); amdgpu_ras_block_late_fini(adev, ras_block);
return r; return r;
} }
void amdgpu_nbio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{
if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF) &&
ras_block)
amdgpu_ras_block_late_fini(adev, ras_block);
}
...@@ -105,5 +105,4 @@ struct amdgpu_nbio { ...@@ -105,5 +105,4 @@ struct amdgpu_nbio {
}; };
int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block); int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void amdgpu_nbio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block);
#endif #endif
...@@ -671,7 +671,7 @@ struct amdgpu_nbio_ras nbio_v7_4_ras = { ...@@ -671,7 +671,7 @@ struct amdgpu_nbio_ras nbio_v7_4_ras = {
}, },
.hw_ops = &nbio_v7_4_ras_hw_ops, .hw_ops = &nbio_v7_4_ras_hw_ops,
.ras_late_init = amdgpu_nbio_ras_late_init, .ras_late_init = amdgpu_nbio_ras_late_init,
.ras_fini = amdgpu_nbio_ras_fini, .ras_fini = amdgpu_ras_block_late_fini,
}, },
.handle_ras_controller_intr_no_bifring = nbio_v7_4_handle_ras_controller_intr_no_bifring, .handle_ras_controller_intr_no_bifring = nbio_v7_4_handle_ras_controller_intr_no_bifring,
.handle_ras_err_event_athub_intr_no_bifring = nbio_v7_4_handle_ras_err_event_athub_intr_no_bifring, .handle_ras_err_event_athub_intr_no_bifring = nbio_v7_4_handle_ras_err_event_athub_intr_no_bifring,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment