From nobody Sun Apr 5 13:04:09 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D072307AD6 for ; Sat, 7 Mar 2026 14:10:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892634; cv=none; b=oKlRviOM5Ql5UBEeeBcMwE7yPRiuF0qEJwOvjnvRiECvwfu75pDMT2cOqIfgb8nc0kdWcjXjvmWFSX5DjZNv5c56HqLp2zEhwIgHbKKUq9wZw5Fe/mrwcP2vmO/smg/6zhyoRL3bZBQbRhjWx1+XjihVj5nGlKZebJgsdv8mo1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772892634; c=relaxed/simple; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hYCXLw7264xJaBD3rsIKJFcdI0DyX4nvbKH60z2IwdPPlOqMks/YkdSuss2ldFrLPJ4m/IF7ML5s+vgDKoYtZ7OGEqCsnnGaoYkC98ZoBd8m8uvWtuIX21P+sASXfRxRCqgeYL8/Q47VJs4XU0mKj9BSgT0RyR0an1KHPuV6TJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Aux89Agx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Aux89Agx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3BB4C2BC9E; Sat, 7 Mar 2026 14:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772892634; bh=UEa8pSyFT22w1D3rLfwgM3e/8DnQwFNgDIPidE+rLcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aux89Agxdn2hyCZMhQSsgy2lB4Z3PxY4Q19nOL4P3Nh0EoOIqtlkBEuxvqi7SUKOw FglL6NLpYZcIwy6GnsED8zID/iP85th4vmZ8EngiPqjujACWqJ0trV/yq2xoPiVajq 3nCUKvoK88/D++quyDCWAdqa/3kBFbxA9Q3KVUS+T8kdI+YcYwcUYTPszh4Zt2UtK/ sO2u2b2kWS4A5SdX3Xxy9aD7H9RSAXWj8xGEM40IoZTUPEyTC5g7iA/cfzkwkBruLK QTIJFeelb7i3wDF4jT+FQAaadRGdtRNu2c1NMt6h1NMvOINvHIQB2PN1luez4z1GzU gR1+7zoIN1DKg== From: "Mario Limonciello (AMD)" To: Yazen Ghannam , Jean Delvare Cc: linux-kernel@vger.kernel.org, Borislav Petkov , "Mario Limonciello (AMD)" Subject: [PATCH v6 4/5] firmware: dmi: Add pr_fmt() for dmi_scan.c Date: Sat, 7 Mar 2026 08:10:23 -0600 Message-ID: <20260307141024.819807-5-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260307141024.819807-1-superm1@kernel.org> References: <20260307141024.819807-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) --- 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 #include #include @@ -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"); } =20 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"); =20 return ret; } @@ -831,7 +834,7 @@ void __init dmi_setup(void) return; =20 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); } --=20 2.43.0