| Message ID | 20240304174454.1484507-7-igor.opaniuk@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Ilias Apalodimas |
| Headers | show |
| Series | TEE: minor cleanup | expand |
On Mon, 4 Mar 2024 at 19:45, Igor Opaniuk <igor.opaniuk@gmail.com> wrote: > > 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' Ci is happy now Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> > > 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 >
On Mon, Mar 4, 2024 at 11:46 AM Igor Opaniuk <igor.opaniuk@gmail.com> wrote: > > 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> > --- Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > > 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 >
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>
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(-)