Merge tag 'uuid-for-4.14' of git://git.infradead.org/users/hch/uuid
[sfrench/cifs-2.6.git] / drivers / firmware / efi / cper.c
index bf3672a81e4948e87e494e4199cf6a16c1692793..d2fcafcea07e54d4b5cde6fe8ce433e2b3a4bbf8 100644 (file)
@@ -534,7 +534,7 @@ static void
 cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata,
                           int sec_no)
 {
 cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata,
                           int sec_no)
 {
-       uuid_le *sec_type = (uuid_le *)gdata->section_type;
+       guid_t *sec_type = (guid_t *)gdata->section_type;
        __u16 severity;
        char newpfx[64];
 
        __u16 severity;
        char newpfx[64];
 
@@ -545,12 +545,12 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata
        printk("%s""Error %d, type: %s\n", pfx, sec_no,
               cper_severity_str(severity));
        if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
        printk("%s""Error %d, type: %s\n", pfx, sec_no,
               cper_severity_str(severity));
        if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
-               printk("%s""fru_id: %pUl\n", pfx, (uuid_le *)gdata->fru_id);
+               printk("%s""fru_id: %pUl\n", pfx, gdata->fru_id);
        if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
                printk("%s""fru_text: %.20s\n", pfx, gdata->fru_text);
 
        snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP);
        if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
                printk("%s""fru_text: %.20s\n", pfx, gdata->fru_text);
 
        snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP);
-       if (!uuid_le_cmp(*sec_type, CPER_SEC_PROC_GENERIC)) {
+       if (guid_equal(sec_type, &CPER_SEC_PROC_GENERIC)) {
                struct cper_sec_proc_generic *proc_err = acpi_hest_get_payload(gdata);
 
                printk("%s""section_type: general processor error\n", newpfx);
                struct cper_sec_proc_generic *proc_err = acpi_hest_get_payload(gdata);
 
                printk("%s""section_type: general processor error\n", newpfx);
@@ -558,7 +558,7 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata
                        cper_print_proc_generic(newpfx, proc_err);
                else
                        goto err_section_too_small;
                        cper_print_proc_generic(newpfx, proc_err);
                else
                        goto err_section_too_small;
-       } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
+       } else if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) {
                struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);
 
                printk("%s""section_type: memory error\n", newpfx);
                struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);
 
                printk("%s""section_type: memory error\n", newpfx);
@@ -568,7 +568,7 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata
                                       gdata->error_data_length);
                else
                        goto err_section_too_small;
                                       gdata->error_data_length);
                else
                        goto err_section_too_small;
-       } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) {
+       } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) {
                struct cper_sec_pcie *pcie = acpi_hest_get_payload(gdata);
 
                printk("%s""section_type: PCIe error\n", newpfx);
                struct cper_sec_pcie *pcie = acpi_hest_get_payload(gdata);
 
                printk("%s""section_type: PCIe error\n", newpfx);