tpm: Redefine pr_fmt

Commit Message

Jarkko Sakkinen June 8, 2023, 2:20 p.m. UTC

Redefine pr_fmt inside internal include, following the pattern from
arch/x86/kernel/cpu/sgx.h.

Signed-off-by: Jarkko Sakkinen <[e-mail]>
---
 drivers/char/tpm/tpm-interface.c | 4 ++--
 drivers/char/tpm/tpm.h           | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 586ca10b0d72..0689e5f3b4c0 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -493,13 +493,13 @@  static int __init tpm_init(void)
 
 	rc = alloc_chrdev_region(&tpm_devt, 0, 2*TPM_NUM_DEVICES, "tpm");
 	if (rc < 0) {
-		pr_err("tpm: failed to allocate char dev region\n");
+		pr_err("failed to allocate char dev region\n");
 		goto out_destroy_tpmrm_class;
 	}
 
 	rc = tpm_dev_common_init();
 	if (rc) {
-		pr_err("tpm: failed to allocate char dev region\n");
+		pr_err("failed to allocate char dev region\n");
 		goto out_unreg_chrdev;
 	}
 
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 460bb85dd142..13733474a235 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -27,6 +27,10 @@ 
 #include <linux/tpm.h>
 #include <linux/tpm_eventlog.h>
 
+
+#undef pr_fmt
+#define pr_fmt(fmt) "tpm: " fmt
+
 #ifdef CONFIG_X86
 #include <asm/intel-family.h>
 #endif