mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 06:30:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'amd-tee-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2025-05-09 23:14:57 +02:00
parent fd11231a7d 136deca59b
commit 60dce06e49
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/tee/amdtee/core.c
View File

@@ -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 @@ static int __init amdtee_driver_init(void)
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);