From: Xiang Liu <[email protected]> Rename CPER section descriptor struct to avoid conflicting with UEFI definition.
Signed-off-by: Xiang Liu <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/ras/core/ras_cper.c | 6 +++--- drivers/gpu/drm/amd/ras/core/ras_cper.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/ras/core/ras_cper.c b/drivers/gpu/drm/amd/ras/core/ras_cper.c index 4ffac4289dbdb..dd95e6891bcf2 100644 --- a/drivers/gpu/drm/amd/ras/core/ras_cper.c +++ b/drivers/gpu/drm/amd/ras/core/ras_cper.c @@ -101,7 +101,7 @@ static void fill_section_hdr(struct ras_core_context *ras_core, } static int fill_section_descriptor(struct ras_core_context *ras_core, - struct cper_section_descriptor *descriptor, + struct cper_section_desc *descriptor, enum ras_cper_severity sev, struct ras_cper_guid sec_type, uint32_t section_offset, @@ -178,7 +178,7 @@ static int cper_generate_runtime_record(struct ras_core_context *ras_core, struct cper_section_hdr *hdr, struct ras_log_info *trace_arr, uint32_t arr_num, enum ras_cper_severity sev) { - struct cper_section_descriptor *descriptor; + struct cper_section_desc *descriptor; struct cper_section_runtime *runtime; int i; @@ -186,7 +186,7 @@ static int cper_generate_runtime_record(struct ras_core_context *ras_core, hdr->record_length = RAS_HDR_LEN + ((RAS_SEC_DESC_LEN + RAS_NONSTD_SEC_LEN) * arr_num); hdr->sec_cnt = arr_num; for (i = 0; i < arr_num; i++) { - descriptor = (struct cper_section_descriptor *)((uint8_t *)hdr + + descriptor = (struct cper_section_desc *)((uint8_t *)hdr + RAS_SEC_DESC_OFFSET(i)); runtime = (struct cper_section_runtime *)((uint8_t *)hdr + RAS_NONSTD_SEC_OFFSET(hdr->sec_cnt, i)); diff --git a/drivers/gpu/drm/amd/ras/core/ras_cper.h b/drivers/gpu/drm/amd/ras/core/ras_cper.h index e4e3615ecc2e0..8bfbeb7d78e01 100644 --- a/drivers/gpu/drm/amd/ras/core/ras_cper.h +++ b/drivers/gpu/drm/amd/ras/core/ras_cper.h @@ -137,7 +137,7 @@ struct cper_section_hdr { uint8_t reserved[12]; /* Reserved */ }; -struct cper_section_descriptor { +struct cper_section_desc { uint32_t sec_offset; /* Offset from the start of CPER entry */ uint32_t sec_length; uint8_t revision_minor; /* CPER_SEC_MINOR_REV_1 */ @@ -275,7 +275,7 @@ struct cper_section_boot { struct ras_cper_fatal_record { struct cper_section_hdr hdr; - struct cper_section_descriptor descriptor; + struct cper_section_desc descriptor; struct cper_section_fatal fatal; }; #pragma pack(pop) -- 2.55.0
