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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
index acc0c428f6faee206f5fde41236fb6de4547145c..08037f086d28743b601698fb3274275417cd6960 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
@@ -23,17 +23,16 @@
 
 #include "amdgpu_ras.h"
 
-int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info)
+int amdgpu_umc_ras_late_init(struct amdgpu_device *adev)
 {
        int r;
-       struct ras_ih_if *ih_info = (struct ras_ih_if *)ras_ih_info;
        struct ras_fs_if fs_info = {
                .sysfs_name = "umc_err_count",
                .debugfs_name = "umc_err_inject",
        };
-
-       if (!ih_info)
-               return -EINVAL;
+       struct ras_ih_if ih_info = {
+               .cb = amdgpu_umc_process_ras_data_cb,
+       };
 
        if (!adev->umc.ras_if) {
                adev->umc.ras_if =
@@ -45,10 +44,10 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info)
                adev->umc.ras_if->sub_block_index = 0;
                strcpy(adev->umc.ras_if->name, "umc");
        }
-       ih_info->head = fs_info.head = *adev->umc.ras_if;
+       ih_info.head = fs_info.head = *adev->umc.ras_if;
 
        r = amdgpu_ras_late_init(adev, adev->umc.ras_if,
-                                &fs_info, ih_info);
+                                &fs_info, &ih_info);
        if (r)
                goto free;
 
@@ -68,7 +67,7 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info)
        return 0;
 
 late_fini:
-       amdgpu_ras_late_fini(adev, adev->umc.ras_if, ih_info);
+       amdgpu_ras_late_fini(adev, adev->umc.ras_if, &ih_info);
 free:
        kfree(adev->umc.ras_if);
        adev->umc.ras_if = NULL;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
index 72c378aec724e185bde74e114879cf3449120784..8cc9852e99e6af46519be77122d966bfb7cf1b25 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
@@ -55,7 +55,7 @@
 
 struct amdgpu_umc_funcs {
        void (*err_cnt_init)(struct amdgpu_device *adev);
-       int (*ras_late_init)(struct amdgpu_device *adev, void *ras_ih_info);
+       int (*ras_late_init)(struct amdgpu_device *adev);
        void (*query_ras_error_count)(struct amdgpu_device *adev,
                                        void *ras_error_status);
        void (*query_ras_error_address)(struct amdgpu_device *adev,
@@ -82,7 +82,7 @@ struct amdgpu_umc {
        const struct amdgpu_umc_funcs *funcs;
 };
 
-int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info);
+int amdgpu_umc_ras_late_init(struct amdgpu_device *adev);
 int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,
                void *ras_error_status,
                struct amdgpu_iv_entry *entry);

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 5ba99f8aec2ef778c1641bae677980c79b446cf5..bf7929499f0a85ef0ec39f166f4e0828e33a9581 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -740,12 +740,9 @@ static int gmc_v9_0_ecc_late_init(void *handle)
 {
        int r;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-       struct ras_ih_if umc_ih_info = {
-               .cb = amdgpu_umc_process_ras_data_cb,
-       };
 
        if (adev->umc.funcs && adev->umc.funcs->ras_late_init) {
-               r = adev->umc.funcs->ras_late_init(adev, &umc_ih_info);
+               r = adev->umc.funcs->ras_late_init(adev);
                if (r)
                        return r;
        }