Skip to content

Commit 60dce06

Browse files
committed
Merge tag 'amd-tee-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers
AMD-TEE driver updates for v6.16 - Sort header includes - Use pr_fmt * tag 'amd-tee-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee: amdtee: Sort header includes amdtee: Use pr_fmt for messages Link: https://lore.kernel.org/r/20250509065833.GB4188600@rayden Signed-off-by: Arnd Bergmann <[email protected]>
2 parents fd11231 + 136deca commit 60dce06

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

drivers/tee/amdtee/core.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,22 @@
33
* Copyright 2019 Advanced Micro Devices, Inc.
44
*/
55

6+
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
7+
68
#include <linux/errno.h>
9+
#include <linux/device.h>
10+
#include <linux/firmware.h>
711
#include <linux/io.h>
12+
#include <linux/mm.h>
813
#include <linux/module.h>
14+
#include <linux/psp-tee.h>
915
#include <linux/slab.h>
1016
#include <linux/string.h>
11-
#include <linux/device.h>
1217
#include <linux/tee_core.h>
1318
#include <linux/types.h>
14-
#include <linux/mm.h>
1519
#include <linux/uaccess.h>
16-
#include <linux/firmware.h>
20+
1721
#include "amdtee_private.h"
18-
#include <linux/psp-tee.h>
1922

2023
static struct amdtee_driver_data *drv_data;
2124
static DEFINE_MUTEX(session_list_mutex);
@@ -458,7 +461,7 @@ static int __init amdtee_driver_init(void)
458461

459462
rc = psp_check_tee_status();
460463
if (rc) {
461-
pr_err("amd-tee driver: tee not present\n");
464+
pr_err("tee not present\n");
462465
return rc;
463466
}
464467

@@ -494,7 +497,6 @@ static int __init amdtee_driver_init(void)
494497

495498
drv_data->amdtee = amdtee;
496499

497-
pr_info("amd-tee driver initialization successful\n");
498500
return 0;
499501

500502
err_device_unregister:
@@ -510,7 +512,7 @@ static int __init amdtee_driver_init(void)
510512
kfree(drv_data);
511513
drv_data = NULL;
512514

513-
pr_err("amd-tee driver initialization failed\n");
515+
pr_err("initialization failed\n");
514516
return rc;
515517
}
516518
module_init(amdtee_driver_init);

0 commit comments

Comments
 (0)