diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-05-10 00:14:57 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-05-10 00:14:57 +0300 |
| commit | 60dce06e49c880169e3b37ddec159ed3bc26682d (patch) | |
| tree | b0ef97da4fbd6d26a0c7f0b032c02aadd13e6450 | |
| parent | fd11231a7dfbaebe99c25c0ec8b8717892dd6b0a (diff) | |
| parent | 136deca59b1613c22aebfb0c8508dd02363c7142 (diff) | |
| download | linux-60dce06e49c880169e3b37ddec159ed3bc26682d.tar.xz | |
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 <arnd@arndb.de>
| -rw-r--r-- | drivers/tee/amdtee/core.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c index e487231d25dc..fb39d9a19c69 100644 --- a/drivers/tee/amdtee/core.c +++ b/drivers/tee/amdtee/core.c @@ -3,19 +3,22 @@ * Copyright 2019 Advanced Micro Devices, Inc. */ + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/errno.h> +#include <linux/device.h> +#include <linux/firmware.h> #include <linux/io.h> +#include <linux/mm.h> #include <linux/module.h> +#include <linux/psp-tee.h> #include <linux/slab.h> #include <linux/string.h> -#include <linux/device.h> #include <linux/tee_core.h> #include <linux/types.h> -#include <linux/mm.h> #include <linux/uaccess.h> -#include <linux/firmware.h> + #include "amdtee_private.h" -#include <linux/psp-tee.h> static struct amdtee_driver_data *drv_data; static DEFINE_MUTEX(session_list_mutex); @@ -458,7 +461,7 @@ static int __init amdtee_driver_init(void) rc = psp_check_tee_status(); if (rc) { - pr_err("amd-tee driver: tee not present\n"); + pr_err("tee not present\n"); return rc; } @@ -494,7 +497,6 @@ static int __init amdtee_driver_init(void) drv_data->amdtee = amdtee; - pr_info("amd-tee driver initialization successful\n"); return 0; err_device_unregister: @@ -510,7 +512,7 @@ err_kfree_drv_data: kfree(drv_data); drv_data = NULL; - pr_err("amd-tee driver initialization failed\n"); + pr_err("initialization failed\n"); return rc; } module_init(amdtee_driver_init); |