[PATCH v3 4/5] firmware: dmi: Add pr_fmt() for dmi_scan.c

Mario Limonciello (AMD) posted 5 patches 3 weeks, 6 days ago
[PATCH v3 4/5] firmware: dmi: Add pr_fmt() for dmi_scan.c
Posted by Mario Limonciello (AMD) 3 weeks, 6 days ago
From: Mario Limonciello <mario.limonciello@amd.com>

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 <mario.limonciello@amd.com>
---
 drivers/firmware/dmi_scan.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 80aded4c778bc..caa09ddf0dfa7 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;
 		}
 	}
@@ -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
Re: [PATCH v3 4/5] firmware: dmi: Add pr_fmt() for dmi_scan.c
Posted by Yazen Ghannam 3 weeks ago
On Sat, Jan 10, 2026 at 07:48:33AM -0600, Mario Limonciello (AMD) wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> 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 <mario.limonciello@amd.com>
> ---
>  drivers/firmware/dmi_scan.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
> index 80aded4c778bc..caa09ddf0dfa7 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;
>  		}
>  	}
> @@ -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);
>  }
> -- 
> 

What about dropping "DMI" from this one too?
	pr_info("DMI not present or invalid.\n");

Thanks,
Yazen