From: Igor Opaniuk <igor.opaniuk@gmail.com>
To: u-boot@lists.denx.de
Cc: Igor Opaniuk <igor.opaniuk@gmail.com>,
Etienne Carriere <etienne.carriere@foss.st.com>,
Heinrich Schuchardt <xypron.glpk@gmx.de>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
Jens Wiklander <jens.wiklander@linaro.org>,
Jorge Ramirez-Ortiz <jorge@foundries.io>,
Patrice Chotard <patrice.chotard@foss.st.com>,
Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>
Subject: [PATCH v3 6/6] tee: remove common.h inclusion
Date: Mon, 4 Mar 2024 18:44:54 +0100 [thread overview]
Message-ID: <20240304174454.1484507-7-igor.opaniuk@gmail.com> (raw)
In-Reply-To: <20240304174454.1484507-1-igor.opaniuk@gmail.com>
The usage of the common.h include file is deprecated [1], and has already
been removed from several files.
Get rid of all inclusions in the "drivers/tee" directory, and replace it
with required include files directly where needed.
[1] doc/develop/codingstyle.rst
Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
drivers/tee/broadcom/chimp_optee.c | 3 ++-
drivers/tee/optee/core.c | 1 -
drivers/tee/optee/i2c.c | 1 -
drivers/tee/optee/rpmb.c | 1 -
drivers/tee/optee/supplicant.c | 2 +-
drivers/tee/sandbox.c | 2 +-
drivers/tee/tee-uclass.c | 1 -
7 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 37f9b094f76..bd146ef2899 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -3,9 +3,10 @@
* Copyright 2020 Broadcom.
*/
-#include <common.h>
#include <tee.h>
#include <broadcom/chimp.h>
+#include <linux/errno.h>
+#include <string.h>
#ifdef CONFIG_CHIMP_OPTEE
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 47f845cffe3..5fc0505c788 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -3,7 +3,6 @@
* Copyright (c) 2018-2020 Linaro Limited
*/
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <dm/device_compat.h>
diff --git a/drivers/tee/optee/i2c.c b/drivers/tee/optee/i2c.c
index ef4e10f9912..e3fb99897c5 100644
--- a/drivers/tee/optee/i2c.c
+++ b/drivers/tee/optee/i2c.c
@@ -3,7 +3,6 @@
* Copyright (c) 2020 Foundries.io Ltd
*/
-#include <common.h>
#include <dm.h>
#include <i2c.h>
#include <tee.h>
diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index 5bc13757ea8..bacced6af6c 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -3,7 +3,6 @@
* Copyright (c) 2018 Linaro Limited
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <tee.h>
diff --git a/drivers/tee/optee/supplicant.c b/drivers/tee/optee/supplicant.c
index f9dd874b594..8a426f53ba8 100644
--- a/drivers/tee/optee/supplicant.c
+++ b/drivers/tee/optee/supplicant.c
@@ -3,10 +3,10 @@
* Copyright (c) 2018, Linaro Limited
*/
-#include <common.h>
#include <log.h>
#include <malloc.h>
#include <tee.h>
+#include <linux/errno.h>
#include <linux/types.h>
#include "optee_msg.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index ec66401878c..8ad7c09efdd 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2018 Linaro Limited
*/
-#include <common.h>
+
#include <dm.h>
#include <sandboxtee.h>
#include <tee.h>
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 52412a4098e..0194d732193 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY UCLASS_TEE
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <log.h>
--
2.34.1
next prev parent reply other threads:[~2024-03-04 17:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 1/6] tee: optee: fix description in Kconfig Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 2/6] tee: sandbox: fix spelling errors Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 3/6] cmd: optee_rpmb: close tee session Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 4/6] cmd: optee_rpmb: build cmd for sandbox Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 5/6] test: py: add optee_rpmb tests Igor Opaniuk
2024-03-04 17:44 ` Igor Opaniuk [this message]
2024-03-08 13:27 ` [PATCH v3 6/6] tee: remove common.h inclusion Ilias Apalodimas
2024-03-08 18:08 ` Sam Protsenko
2024-03-27 12:13 ` [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
2024-03-27 14:17 ` Ilias Apalodimas
2024-04-04 7:22 ` Ilias Apalodimas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240304174454.1484507-7-igor.opaniuk@gmail.com \
--to=igor.opaniuk@gmail.com \
--cc=etienne.carriere@foss.st.com \
--cc=ilias.apalodimas@linaro.org \
--cc=jens.wiklander@linaro.org \
--cc=jorge@foundries.io \
--cc=patrice.chotard@foss.st.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox