On Fri, Jan 22, 2021 at 7:05 PM Terry Bowman <[email protected]> wrote:
>
> From: Yazen Ghannam <[email protected]>
>
> Refactor duplicated GHES identity logic into is_ghes_type().
>
> Signed-off-by: Yazen Ghannam <[email protected]>
> Reviewed-by: Robert Richter <[email protected]>
> Signed-off-by: Terry Bowman <[email protected]>
If Terry was a co-author of the patch, please add a Co-developed-by:
tag for him in addition to the s-o-b. Otherwise the meaning of his
s-o-b is unclear.
Boris, James, any objections to the changes below?
> ---
> drivers/acpi/apei/hest.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
> index 6e980fe16772..bd702e0ef339 100644
> --- a/drivers/acpi/apei/hest.c
> +++ b/drivers/acpi/apei/hest.c
> @@ -49,6 +49,12 @@ static const int
> hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
> [ACPI_HEST_TYPE_IA32_DEFERRED_CHECK] = -1,
> };
>
> +static inline bool is_ghes_type(struct acpi_hest_header *hest_hdr)
> +{
> + return hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR ||
> + hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR_V2;
> +}
> +
> static int hest_esrc_len(struct acpi_hest_header *hest_hdr)
> {
> u16 hest_type = hest_hdr->type;
> @@ -141,8 +147,7 @@ static int __init hest_parse_ghes_count(struct
> acpi_hest_header *hest_hdr, void
> {
> int *count = data;
>
> - if (hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR ||
> - hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR_V2)
> + if (is_ghes_type(hest_hdr))
> (*count)++;
> return 0;
> }
> @@ -153,8 +158,7 @@ static int __init hest_parse_ghes(struct acpi_hest_header
> *hest_hdr, void *data)
> struct ghes_arr *ghes_arr = data;
> int rc, i;
>
> - if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR &&
> - hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR_V2)
> + if (!is_ghes_type(hest_hdr))
> return 0;
>
> if (!((struct acpi_hest_generic *)hest_hdr)->enabled)
> --
> 2.27.0
>
