Commit 30e58102 authored by yipechai's avatar yipechai Committed by Alex Deucher
Browse files

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: 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 149d7ba1

drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c

+0 −6
Original line number Diff line number Diff line
@@ -70,9 +70,3 @@ void amdgpu_mca_query_ras_error_count(struct amdgpu_device *adev, 


	amdgpu_mca_reset_error_count(adev, mc_status_addr);

}
 


void amdgpu_mca_ras_fini(struct amdgpu_device *adev,

			 struct amdgpu_mca_ras *mca_dev)

{

	amdgpu_ras_block_late_fini(adev, mca_dev->ras_if);

}
 
 No newline at end of file

drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h

+0 −3
Original line number Diff line number Diff line
@@ -56,7 +56,4 @@ void amdgpu_mca_query_ras_error_count(struct amdgpu_device *adev, 
				      uint64_t mc_status_addr,

				      void *ras_error_status);



void amdgpu_mca_ras_fini(struct amdgpu_device *adev,

			 struct amdgpu_mca_ras *mca_dev);



#endif

drivers/gpu/drm/amd/amdgpu/mca_v3_0.c

+3 −18
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ static void mca_v3_0_mp0_query_ras_error_count(struct amdgpu_device *adev, 
				         ras_error_status);

}



static void mca_v3_0_mp0_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	amdgpu_mca_ras_fini(adev, &adev->mca.mp0);

}



static int mca_v3_0_ras_block_match(struct amdgpu_ras_block_object *block_obj,

				enum amdgpu_ras_block block, uint32_t sub_block_index)

{
@@ -71,7 +66,7 @@ struct amdgpu_mca_ras_block mca_v3_0_mp0_ras = { 
		},

		.hw_ops = &mca_v3_0_mp0_hw_ops,

		.ras_block_match = mca_v3_0_ras_block_match,

		.ras_fini = mca_v3_0_mp0_ras_fini,

		.ras_fini = amdgpu_ras_block_late_fini,

	},

};
@@ -83,11 +78,6 @@ static void mca_v3_0_mp1_query_ras_error_count(struct amdgpu_device *adev, 
				         ras_error_status);

}



static void mca_v3_0_mp1_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	amdgpu_mca_ras_fini(adev, &adev->mca.mp1);

}



const struct amdgpu_ras_block_hw_ops mca_v3_0_mp1_hw_ops = {

	.query_ras_error_count = mca_v3_0_mp1_query_ras_error_count,

	.query_ras_error_address = NULL,
@@ -103,7 +93,7 @@ struct amdgpu_mca_ras_block mca_v3_0_mp1_ras = { 
		},

		.hw_ops = &mca_v3_0_mp1_hw_ops,

		.ras_block_match = mca_v3_0_ras_block_match,

		.ras_fini = mca_v3_0_mp1_ras_fini,

		.ras_fini = amdgpu_ras_block_late_fini,

	},

};
@@ -115,11 +105,6 @@ static void mca_v3_0_mpio_query_ras_error_count(struct amdgpu_device *adev, 
				         ras_error_status);

}



static void mca_v3_0_mpio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	amdgpu_mca_ras_fini(adev, &adev->mca.mpio);

}



const struct amdgpu_ras_block_hw_ops mca_v3_0_mpio_hw_ops = {

	.query_ras_error_count = mca_v3_0_mpio_query_ras_error_count,

	.query_ras_error_address = NULL,
@@ -135,7 +120,7 @@ struct amdgpu_mca_ras_block mca_v3_0_mpio_ras = { 
		},

		.hw_ops = &mca_v3_0_mpio_hw_ops,

		.ras_block_match = mca_v3_0_ras_block_match,

		.ras_fini = mca_v3_0_mpio_ras_fini,

		.ras_fini = amdgpu_ras_block_late_fini,

	},

};