[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20260121060431.432350-5-superm1@kernel.org>
Date: Wed, 21 Jan 2026 00:04:29 -0600
From: "Mario Limonciello (AMD)" <superm1@...nel.org>
To: Yazen Ghannam <yazen.ghannam@....com>,
Jean Delvare <jdelvare@...e.com>
Cc: linux-kernel@...r.kernel.org,
Borislav Petkov <bp@...en8.de>,
"Mario Limonciello (AMD)" <superm1@...nel.org>
Subject: [PATCH v4 4/6] firmware: dmi: Add pr_fmt() for dmi_scan.c
Several prints inconsistently use DMI: or dmi: or nothing. To make
it clear which prints come from dmi_scan.c, add a pr_fmt macro.
Signed-off-by: Mario Limonciello (AMD) <superm1@...nel.org>
---
v4:
* Adjust "DMI not present or invalid" message too (Yazen)
---
drivers/firmware/dmi_scan.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 80aded4c778bc..ed6235ac576b6 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -1,4 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
+
+#define pr_fmt(fmt) "DMI: " fmt
+
#include <linux/types.h>
#include <linux/string.h>
#include <linux/init.h>
@@ -634,7 +637,7 @@ static int __init dmi_present(const u8 *buf)
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);
}
dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
- pr_info("DMI: %s\n", dmi_ids_string);
+ pr_info("%s\n", dmi_ids_string);
return 0;
}
}
@@ -663,7 +666,7 @@ static int __init dmi_smbios3_present(const u8 *buf)
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF,
dmi_ver & 0xFF);
dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
- pr_info("DMI: %s\n", dmi_ids_string);
+ pr_info("%s\n", dmi_ids_string);
return 0;
}
}
@@ -758,7 +761,7 @@ static void __init dmi_scan_machine(void)
dmi_early_unmap(p, 0x10000);
}
error:
- pr_info("DMI not present or invalid.\n");
+ pr_info("not present or invalid.\n");
}
static __ro_after_init BIN_ATTR_SIMPLE_ADMIN_RO(smbios_entry_point);
@@ -810,7 +813,7 @@ static int __init dmi_init(void)
kobject_del(tables_kobj);
kobject_put(tables_kobj);
err:
- pr_err("dmi: Firmware registration failed.\n");
+ pr_err("Firmware registration failed.\n");
return ret;
}
@@ -831,7 +834,7 @@ void __init dmi_setup(void)
return;
dmi_memdev_walk();
- pr_info("DMI: Memory slots populated: %d/%d\n",
+ pr_info("Memory slots populated: %d/%d\n",
dmi_memdev_populated_nr, dmi_memdev_nr);
dump_stack_set_arch_desc("%s", dmi_ids_string);
}
--
2.43.0
Powered by blists - more mailing lists