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

drm/amdgpu: remove ih_info parameter of umc_ras_late_init

umc_ras_late_init can get the info by itself

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tao Zhou and committed by
Alex Deucher
56c54b25 e536c818

+10 -14
+7 -8
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
··· 23 23 24 24 #include "amdgpu_ras.h" 25 25 26 - int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) 26 + int amdgpu_umc_ras_late_init(struct amdgpu_device *adev) 27 27 { 28 28 int r; 29 - struct ras_ih_if *ih_info = (struct ras_ih_if *)ras_ih_info; 30 29 struct ras_fs_if fs_info = { 31 30 .sysfs_name = "umc_err_count", 32 31 .debugfs_name = "umc_err_inject", 33 32 }; 34 - 35 - if (!ih_info) 36 - return -EINVAL; 33 + struct ras_ih_if ih_info = { 34 + .cb = amdgpu_umc_process_ras_data_cb, 35 + }; 37 36 38 37 if (!adev->umc.ras_if) { 39 38 adev->umc.ras_if = ··· 44 45 adev->umc.ras_if->sub_block_index = 0; 45 46 strcpy(adev->umc.ras_if->name, "umc"); 46 47 } 47 - ih_info->head = fs_info.head = *adev->umc.ras_if; 48 + ih_info.head = fs_info.head = *adev->umc.ras_if; 48 49 49 50 r = amdgpu_ras_late_init(adev, adev->umc.ras_if, 50 - &fs_info, ih_info); 51 + &fs_info, &ih_info); 51 52 if (r) 52 53 goto free; 53 54 ··· 67 68 return 0; 68 69 69 70 late_fini: 70 - amdgpu_ras_late_fini(adev, adev->umc.ras_if, ih_info); 71 + amdgpu_ras_late_fini(adev, adev->umc.ras_if, &ih_info); 71 72 free: 72 73 kfree(adev->umc.ras_if); 73 74 adev->umc.ras_if = NULL;
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
··· 55 55 56 56 struct amdgpu_umc_funcs { 57 57 void (*err_cnt_init)(struct amdgpu_device *adev); 58 - int (*ras_late_init)(struct amdgpu_device *adev, void *ras_ih_info); 58 + int (*ras_late_init)(struct amdgpu_device *adev); 59 59 void (*query_ras_error_count)(struct amdgpu_device *adev, 60 60 void *ras_error_status); 61 61 void (*query_ras_error_address)(struct amdgpu_device *adev, ··· 82 82 const struct amdgpu_umc_funcs *funcs; 83 83 }; 84 84 85 - int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info); 85 + int amdgpu_umc_ras_late_init(struct amdgpu_device *adev); 86 86 int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, 87 87 void *ras_error_status, 88 88 struct amdgpu_iv_entry *entry);
+1 -4
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
··· 740 740 { 741 741 int r; 742 742 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 743 - struct ras_ih_if umc_ih_info = { 744 - .cb = amdgpu_umc_process_ras_data_cb, 745 - }; 746 743 747 744 if (adev->umc.funcs && adev->umc.funcs->ras_late_init) { 748 - r = adev->umc.funcs->ras_late_init(adev, &umc_ih_info); 745 + r = adev->umc.funcs->ras_late_init(adev); 749 746 if (r) 750 747 return r; 751 748 }