aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/nfit.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index bb29e56276bd..cf0fd96a7602 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -702,11 +702,11 @@ static ssize_t flags_show(struct device *dev,
702 u16 flags = to_nfit_memdev(dev)->flags; 702 u16 flags = to_nfit_memdev(dev)->flags;
703 703
704 return sprintf(buf, "%s%s%s%s%s\n", 704 return sprintf(buf, "%s%s%s%s%s\n",
705 flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save " : "", 705 flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save_fail " : "",
706 flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore " : "", 706 flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore_fail " : "",
707 flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush " : "", 707 flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush_fail " : "",
708 flags & ACPI_NFIT_MEM_ARMED ? "arm " : "", 708 flags & ACPI_NFIT_MEM_ARMED ? "not_armed " : "",
709 flags & ACPI_NFIT_MEM_HEALTH_OBSERVED ? "smart " : ""); 709 flags & ACPI_NFIT_MEM_HEALTH_OBSERVED ? "smart_event " : "");
710} 710}
711static DEVICE_ATTR_RO(flags); 711static DEVICE_ATTR_RO(flags);
712 712
@@ -849,12 +849,12 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)
849 if ((mem_flags & ACPI_NFIT_MEM_FAILED_MASK) == 0) 849 if ((mem_flags & ACPI_NFIT_MEM_FAILED_MASK) == 0)
850 continue; 850 continue;
851 851
852 dev_info(acpi_desc->dev, "%s: failed: %s%s%s%s\n", 852 dev_info(acpi_desc->dev, "%s flags:%s%s%s%s\n",
853 nvdimm_name(nvdimm), 853 nvdimm_name(nvdimm),
854 mem_flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save " : "", 854 mem_flags & ACPI_NFIT_MEM_SAVE_FAILED ? " save_fail" : "",
855 mem_flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore " : "", 855 mem_flags & ACPI_NFIT_MEM_RESTORE_FAILED ? " restore_fail":"",
856 mem_flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush " : "", 856 mem_flags & ACPI_NFIT_MEM_FLUSH_FAILED ? " flush_fail" : "",
857 mem_flags & ACPI_NFIT_MEM_ARMED ? "arm " : ""); 857 mem_flags & ACPI_NFIT_MEM_ARMED ? " not_armed" : "");
858 858
859 } 859 }
860 860