drm/amdgpu: retire unused aca_bank_report data structure

retire unused aca_bank_report data structure.

Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
index 7cbff74c0f2ff71a2424a45cdb383d4541b39926..a0b7f0d0c51304818ea08e725440d2f46367a39a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
@@ -297,29 +297,26 @@ int aca_error_cache_log_bank_error(struct aca_handle *handle, struct aca_bank_in
        return 0;
 }
 
-static int aca_generate_bank_report(struct aca_handle *handle, struct aca_bank *bank,
-                                   enum aca_smu_type type, struct aca_bank_report *report)
+static int aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type)
 {
        const struct aca_bank_ops *bank_ops = handle->bank_ops;
 
-       if (!bank || !report)
+       if (!bank)
                return -EINVAL;
 
-       if (!bank_ops->aca_bank_generate_report)
+       if (!bank_ops->aca_bank_parser)
                return -EOPNOTSUPP;
 
-       memset(report, 0, sizeof(*report));
-       return bank_ops->aca_bank_generate_report(handle, bank, type,
-                                                 report, handle->data);
+       return bank_ops->aca_bank_parser(handle, bank, type,
+                                        handle->data);
 }
 
 static int handler_aca_log_bank_error(struct aca_handle *handle, struct aca_bank *bank,
-                                     enum aca_smu_type smu_type, void *data)
+                                     enum aca_smu_type type, void *data)
 {
-       struct aca_bank_report report;
        int ret;
 
-       ret = aca_generate_bank_report(handle, bank, smu_type, &report);
+       ret = aca_bank_parser(handle, bank, type);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
index 470efefcde10b1ae9bb6f60627925bfb7b52403f..6eb4c0341278fbb66dd2824acccc7f962183a1d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
@@ -122,11 +122,6 @@ struct aca_bank_info {
        int mcatype;
 };
 
-struct aca_bank_report {
-       struct aca_bank_info info;
-       u64 count[ACA_ERROR_TYPE_COUNT];
-};
-
 struct aca_bank_error {
        struct list_head node;
        struct aca_bank_info info;
@@ -164,8 +159,7 @@ struct aca_handle {
 };
 
 struct aca_bank_ops {
-       int (*aca_bank_generate_report)(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,
-                                       struct aca_bank_report *report, void *data);
+       int (*aca_bank_parser)(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type, void *data);
        bool (*aca_bank_is_valid)(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,
                                  void *data);
 };

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 3e7f0199926e33c2194d0819b4a1dfe80676a87e..523827e8e7a8e355d3c7cbc8b5396912c78f4054 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -1035,8 +1035,8 @@ int amdgpu_xgmi_remove_device(struct amdgpu_device *adev)
        return 0;
 }
 
-static int xgmi_v6_4_0_aca_bank_generate_report(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,
-                                               struct aca_bank_report *report, void *data)
+static int xgmi_v6_4_0_aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank,
+                                      enum aca_smu_type type, void *data)
 {
        struct amdgpu_device *adev = handle->adev;
        struct aca_bank_info info;
@@ -1075,7 +1075,7 @@ static int xgmi_v6_4_0_aca_bank_generate_report(struct aca_handle *handle, struc
 }
 
 static const struct aca_bank_ops xgmi_v6_4_0_aca_bank_ops = {
-       .aca_bank_generate_report = xgmi_v6_4_0_aca_bank_generate_report,
+       .aca_bank_parser = xgmi_v6_4_0_aca_bank_parser,
 };
 
 static const struct aca_info xgmi_v6_4_0_aca_info = {

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index cc7cccf0b2b2d12525e22476873c81ca310b5426..fc33354f1d3d38f63bf4a1802edf0dfb0234a84b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -680,9 +680,9 @@ static const struct amdgpu_gfx_funcs gfx_v9_4_3_gfx_funcs = {
        .ih_node_to_logical_xcc = &gfx_v9_4_3_ih_to_xcc_inst,
 };
 
-static int gfx_v9_4_3_aca_bank_generate_report(struct aca_handle *handle,
-                                              struct aca_bank *bank, enum aca_smu_type type,
-                                              struct aca_bank_report *report, void *data)
+static int gfx_v9_4_3_aca_bank_parser(struct aca_handle *handle,
+                                     struct aca_bank *bank, enum aca_smu_type type,
+                                     void *data)
 {
        struct aca_bank_info info;
        u64 misc0;
@@ -736,7 +736,7 @@ static bool gfx_v9_4_3_aca_bank_is_valid(struct aca_handle *handle, struct aca_b
 }
 
 static const struct aca_bank_ops gfx_v9_4_3_aca_bank_ops = {
-       .aca_bank_generate_report = gfx_v9_4_3_aca_bank_generate_report,
+       .aca_bank_parser = gfx_v9_4_3_aca_bank_parser,
        .aca_bank_is_valid = gfx_v9_4_3_aca_bank_is_valid,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
index 50113cadaa0d200f5e0c49c0fa129397db509c33..7a1ff298417abeb08cb67a9ea080f6469d77c168 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
@@ -721,9 +721,8 @@ static const struct amdgpu_ras_block_hw_ops mmhub_v1_8_ras_hw_ops = {
        .reset_ras_error_count = mmhub_v1_8_reset_ras_error_count,
 };
 
-static int mmhub_v1_8_aca_bank_generate_report(struct aca_handle *handle,
-                                              struct aca_bank *bank, enum aca_smu_type type,
-                                              struct aca_bank_report *report, void *data)
+static int mmhub_v1_8_aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank,
+                                     enum aca_smu_type type, void *data)
 {
        struct aca_bank_info info;
        u64 misc0;
@@ -780,7 +779,7 @@ static bool mmhub_v1_8_aca_bank_is_valid(struct aca_handle *handle, struct aca_b
 }
 
 static const struct aca_bank_ops mmhub_v1_8_aca_bank_ops = {
-       .aca_bank_generate_report = mmhub_v1_8_aca_bank_generate_report,
+       .aca_bank_parser = mmhub_v1_8_aca_bank_parser,
        .aca_bank_is_valid = mmhub_v1_8_aca_bank_is_valid,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index 02fc11b98b203a37d3501013c041cc8e8e4e36ac..71c2f50530cbf119e0dd0a77f20611a9f6c53234 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -2189,9 +2189,8 @@ static const struct amdgpu_ras_block_hw_ops sdma_v4_4_2_ras_hw_ops = {
        .reset_ras_error_count = sdma_v4_4_2_reset_ras_error_count,
 };
 
-static int sdma_v4_4_2_aca_bank_generate_report(struct aca_handle *handle,
-                                               struct aca_bank *bank, enum aca_smu_type type,
-                                               struct aca_bank_report *report, void *data)
+static int sdma_v4_4_2_aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank,
+                                      enum aca_smu_type type, void *data)
 {
        struct aca_bank_info info;
        u64 misc0;
@@ -2241,7 +2240,7 @@ static bool sdma_v4_4_2_aca_bank_is_valid(struct aca_handle *handle, struct aca_
 }
 
 static const struct aca_bank_ops sdma_v4_4_2_aca_bank_ops = {
-       .aca_bank_generate_report = sdma_v4_4_2_aca_bank_generate_report,
+       .aca_bank_parser = sdma_v4_4_2_aca_bank_parser,
        .aca_bank_is_valid = sdma_v4_4_2_aca_bank_is_valid,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
index b512a4b38067499b721ccde19797bcc91abaac6c..e2e18ccbbc62edad55f66f0c1af4815edae82dd7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
@@ -504,8 +504,8 @@ const struct amdgpu_ras_block_hw_ops umc_v12_0_ras_hw_ops = {
        .query_ras_error_address = umc_v12_0_query_ras_error_address,
 };
 
-static int umc_v12_0_aca_bank_generate_report(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,
-                                             struct aca_bank_report *report, void *data)
+static int umc_v12_0_aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank,
+                                    enum aca_smu_type type, void *data)
 {
        struct amdgpu_device *adev = handle->adev;
        struct aca_bank_info info;
@@ -542,7 +542,7 @@ static int umc_v12_0_aca_bank_generate_report(struct aca_handle *handle, struct
 }
 
 static const struct aca_bank_ops umc_v12_0_aca_bank_ops = {
-       .aca_bank_generate_report = umc_v12_0_aca_bank_generate_report,
+       .aca_bank_parser = umc_v12_0_aca_bank_parser,
 };
 
 const struct aca_info umc_v12_0_aca_info = {