]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
firmware: dmi: Add pr_fmt() for dmi_scan.c
authorMario Limonciello (AMD) <superm1@kernel.org>
Sat, 7 Mar 2026 14:10:23 +0000 (08:10 -0600)
committerBorislav Petkov (AMD) <bp@alien8.de>
Wed, 1 Apr 2026 18:54:16 +0000 (20:54 +0200)
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@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Link: https://patch.msgid.link/20260307141024.819807-5-superm1@kernel.org
drivers/firmware/dmi_scan.c

index 80aded4c778bcc2b6b3c922ced5f0b8498c2b333..ed6235ac576b6c3a6974b21d7beada87336c45a0 100644 (file)
@@ -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);
 }