diff mbox series

[19/33] arm: meson: Remove <common.h> and add needed includes

Message ID 20240430133559.1836389-19-trini@konsulko.com
State Accepted
Commit f3d0f17ea6458bbdbd79d74d51896beaa09d4ea5
Delegated to: Tom Rini
Headers show
Series [01/33] arm: mach-versatile: Remove dead code | expand

Commit Message

Tom Rini April 30, 2024, 1:35 p.m. UTC
Remove <common.h> from all mach-meson files and when needed add missing
include files directly.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: u-boot-amlogic@groups.io
---
 arch/arm/mach-meson/board-a1.c     | 2 +-
 arch/arm/mach-meson/board-axg.c    | 1 -
 arch/arm/mach-meson/board-common.c | 1 -
 arch/arm/mach-meson/board-g12a.c   | 1 -
 arch/arm/mach-meson/board-gx.c     | 1 -
 arch/arm/mach-meson/board-info.c   | 1 -
 arch/arm/mach-meson/sm.c           | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

Comments

Neil Armstrong May 2, 2024, 7:39 a.m. UTC | #1
On 30/04/2024 15:35, Tom Rini wrote:
> Remove <common.h> from all mach-meson files and when needed add missing
> include files directly.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: u-boot-amlogic@groups.io
> ---
>   arch/arm/mach-meson/board-a1.c     | 2 +-
>   arch/arm/mach-meson/board-axg.c    | 1 -
>   arch/arm/mach-meson/board-common.c | 1 -
>   arch/arm/mach-meson/board-g12a.c   | 1 -
>   arch/arm/mach-meson/board-gx.c     | 1 -
>   arch/arm/mach-meson/board-info.c   | 1 -
>   arch/arm/mach-meson/sm.c           | 1 -
>   7 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c
> index 967bb671822e..f848c0f068ed 100644
> --- a/arch/arm/mach-meson/board-a1.c
> +++ b/arch/arm/mach-meson/board-a1.c
> @@ -3,12 +3,12 @@
>    * (C) Copyright 2023 SberDevices, Inc.
>    */
>   
> -#include <common.h>
>   #include <asm/arch/a1.h>
>   #include <asm/arch/boot.h>
>   #include <asm/armv8/mmu.h>
>   #include <asm/io.h>
>   #include <linux/compiler.h>
> +#include <linux/errno.h>
>   #include <linux/sizes.h>
>   
>   phys_size_t get_effective_memsize(void)
> diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
> index fdf18752cdd0..6535539184cc 100644
> --- a/arch/arm/mach-meson/board-axg.c
> +++ b/arch/arm/mach-meson/board-axg.c
> @@ -4,7 +4,6 @@
>    * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
>    */
>   
> -#include <common.h>
>   #include <init.h>
>   #include <net.h>
>   #include <asm/arch/boot.h>
> diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
> index 7ceba7cede85..39774c43049a 100644
> --- a/arch/arm/mach-meson/board-common.c
> +++ b/arch/arm/mach-meson/board-common.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
>    */
>   
> -#include <common.h>
>   #include <cpu_func.h>
>   #include <fastboot.h>
>   #include <init.h>
> diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
> index d5a830fb1db8..dc4abe1e1074 100644
> --- a/arch/arm/mach-meson/board-g12a.c
> +++ b/arch/arm/mach-meson/board-g12a.c
> @@ -4,7 +4,6 @@
>    * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
>    */
>   
> -#include <common.h>
>   #include <init.h>
>   #include <log.h>
>   #include <net.h>
> diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
> index c3fbdfffeae8..0370ed57e205 100644
> --- a/arch/arm/mach-meson/board-gx.c
> +++ b/arch/arm/mach-meson/board-gx.c
> @@ -4,7 +4,6 @@
>    * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
>    */
>   
> -#include <common.h>
>   #include <init.h>
>   #include <net.h>
>   #include <asm/arch/boot.h>
> diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
> index d51d9b8f0645..b4058f593234 100644
> --- a/arch/arm/mach-meson/board-info.c
> +++ b/arch/arm/mach-meson/board-info.c
> @@ -4,7 +4,6 @@
>    * (C) Copyright 2019 Neil Armstrong <narmstrong@baylibre.com>
>    */
>   
> -#include <common.h>
>   #include <init.h>
>   #include <asm/global_data.h>
>   #include <asm/io.h>
> diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
> index 914fd11c9894..4d9f83d3b38d 100644
> --- a/arch/arm/mach-meson/sm.c
> +++ b/arch/arm/mach-meson/sm.c
> @@ -5,7 +5,6 @@
>    * Secure monitor calls.
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <log.h>
>   #include <regmap.h>

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff mbox series

Patch

diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c
index 967bb671822e..f848c0f068ed 100644
--- a/arch/arm/mach-meson/board-a1.c
+++ b/arch/arm/mach-meson/board-a1.c
@@ -3,12 +3,12 @@ 
  * (C) Copyright 2023 SberDevices, Inc.
  */
 
-#include <common.h>
 #include <asm/arch/a1.h>
 #include <asm/arch/boot.h>
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 phys_size_t get_effective_memsize(void)
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index fdf18752cdd0..6535539184cc 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -4,7 +4,6 @@ 
  * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <asm/arch/boot.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 7ceba7cede85..39774c43049a 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -3,7 +3,6 @@ 
  * (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <fastboot.h>
 #include <init.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index d5a830fb1db8..dc4abe1e1074 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -4,7 +4,6 @@ 
  * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index c3fbdfffeae8..0370ed57e205 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -4,7 +4,6 @@ 
  * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <asm/arch/boot.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index d51d9b8f0645..b4058f593234 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -4,7 +4,6 @@ 
  * (C) Copyright 2019 Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 914fd11c9894..4d9f83d3b38d 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -5,7 +5,6 @@ 
  * Secure monitor calls.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <regmap.h>