[PATCH 1/6] ARM: uniphier: include <asm/system.h> instead of <asm/cache.h> from psci.c
I do not understand the change made to this file by commit 90526e9fbac4 ("common: Drop net.h from common header").
git show 90526e9fbac4 -- arch/arm/mach-uniphier/arm32/psci.c
It added <asm/cache.h> while this file does not call the standard cache functions at all.
All the uniphier-specific cache functions, uniphier_cache_*() are declared in cache-uniphier.h, which is already included from this file.
Including <asm/system.h> is sensible to fix the -Wmissing-prototypes warnings because this file defines psci_cpu_on and psci_system_reset().
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/arm32/psci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index e231e7b60b..b54dc3979d 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -6,7 +6,6 @@
#include <common.h> #include <cpu_func.h> -#include <asm/cache.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/io.h> @@ -17,6 +16,7 @@ #include <asm/processor.h> #include <asm/psci.h> #include <asm/secure.h> +#include <asm/system.h>
#include "../debug.h" #include "../soc-info.h"
I do not understand the changes made to this file by commit 90526e9fbac4 ("common: Drop net.h from common header").
git show 90526e9fbac4 -- arch/arm/mach-uniphier/micro-support-card.c
The necessary declaration is already included by <netdev.h> at line 112. It also moved the <dm/of.h> inclusion, but I do not understand the motivation of doing so, either.
Simply revert the changes made to this file.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/micro-support-card.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 18435dc361..d23c0bd129 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -6,10 +6,9 @@ */
#include <common.h> +#include <dm/of.h> #include <fdt_support.h> #include <log.h> -#include <net.h> -#include <dm/of.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/io.h>
I do not understand the change made to this file by commit 691d719db718 ("common: Drop init.h from common header").
git show 691d719db718 -- arch/arm/mach-uniphier/dram/umc-pxs2.c
This file does not call or define any functions declared in <init.h>
Simply revert the change made to this file.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/dram/umc-pxs2.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c index 3f7e5f30ba..24c6802a27 100644 --- a/arch/arm/mach-uniphier/dram/umc-pxs2.c +++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c @@ -7,7 +7,6 @@ * Copyright (C) 2015 Socionext Inc. */
-#include <init.h> #include <log.h> #include <linux/bitops.h> #include <linux/delay.h>
On Tue, 19 May 2020 at 21:32, Masahiro Yamada yamada.masahiro@socionext.com wrote:
I do not understand the change made to this file by commit 691d719db718 ("common: Drop init.h from common header").
git show 691d719db718 -- arch/arm/mach-uniphier/dram/umc-pxs2.c
This file does not call or define any functions declared in <init.h>
Simply revert the change made to this file.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/mach-uniphier/dram/umc-pxs2.c | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
I do not understand the changes made to these files by commit f7ae49fc4f36 ("common: Drop log.h from common header").
git show f7ae49fc4f36 -- arch/arm/mach-uniphier/
None of them uses the log function feature.
Simply revert the changes made to these files.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/board_init.c | 1 - arch/arm/mach-uniphier/dram/ddrphy-training.c | 1 - arch/arm/mach-uniphier/dram/umc-pxs2.c | 1 - arch/arm/mach-uniphier/micro-support-card.c | 1 - arch/arm/mach-uniphier/nand-reset.c | 1 - 5 files changed, 5 deletions(-)
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 6bf0811edb..4f9cd6e722 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <log.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/printk.h> diff --git a/arch/arm/mach-uniphier/dram/ddrphy-training.c b/arch/arm/mach-uniphier/dram/ddrphy-training.c index c26f56367e..1decdf1cbf 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-training.c +++ b/arch/arm/mach-uniphier/dram/ddrphy-training.c @@ -4,7 +4,6 @@ * Copyright (C) 2015-2016 Socionext Inc. */
-#include <log.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c index 24c6802a27..73574201e3 100644 --- a/arch/arm/mach-uniphier/dram/umc-pxs2.c +++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c @@ -7,7 +7,6 @@ * Copyright (C) 2015 Socionext Inc. */
-#include <log.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/errno.h> diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index d23c0bd129..84c377766a 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -8,7 +8,6 @@ #include <common.h> #include <dm/of.h> #include <fdt_support.h> -#include <log.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/nand-reset.c b/arch/arm/mach-uniphier/nand-reset.c index dbf54aa910..11cadaabd8 100644 --- a/arch/arm/mach-uniphier/nand-reset.c +++ b/arch/arm/mach-uniphier/nand-reset.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <log.h> #include <linux/errno.h> #include <dm.h> #include <dm/uclass-internal.h>
Hi Masahiro,
On Tue, 19 May 2020 at 21:32, Masahiro Yamada yamada.masahiro@socionext.com wrote:
I do not understand the changes made to these files by commit f7ae49fc4f36 ("common: Drop log.h from common header").
git show f7ae49fc4f36 -- arch/arm/mach-uniphier/
None of them uses the log function feature.
Simply revert the changes made to these files.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/mach-uniphier/board_init.c | 1 - arch/arm/mach-uniphier/dram/ddrphy-training.c | 1 - arch/arm/mach-uniphier/dram/umc-pxs2.c | 1 - arch/arm/mach-uniphier/micro-support-card.c | 1 - arch/arm/mach-uniphier/nand-reset.c | 1 - 5 files changed, 5 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Uniphier is very unusual in that it doesn't include common.h in quite a few files. I hope by the next time we get to RC2 common.h will be empty apart from config.h.
Regards, Simon
<common.h> pulls in a lot of bloat. <common.h> is unneeded in most of places.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/arm32/cache-uniphier.c | 1 - arch/arm/mach-uniphier/arm32/psci.c | 1 - arch/arm/mach-uniphier/arm32/timer.c | 2 +- arch/arm/mach-uniphier/arm64/mem_map.c | 1 - arch/arm/mach-uniphier/base-address.c | 2 +- arch/arm/mach-uniphier/board_late_init.c | 1 - arch/arm/mach-uniphier/boards.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-ld11.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-ld4.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-pro5.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device.c | 2 +- arch/arm/mach-uniphier/clk/clk-dram-ld4.c | 1 - arch/arm/mach-uniphier/clk/clk-dram-pxs2.c | 1 - arch/arm/mach-uniphier/clk/clk-early-ld4.c | 1 - arch/arm/mach-uniphier/clk/clk-ld11.c | 1 - arch/arm/mach-uniphier/clk/dpll-ld4.c | 1 - arch/arm/mach-uniphier/clk/dpll-pro4.c | 1 - arch/arm/mach-uniphier/debug-uart/debug-uart.c | 1 - arch/arm/mach-uniphier/dram/cmd_ddrmphy.c | 1 - arch/arm/mach-uniphier/dram/cmd_ddrphy.c | 1 - arch/arm/mach-uniphier/dram/umc-ld4.c | 1 - arch/arm/mach-uniphier/dram/umc-pro4.c | 1 - arch/arm/mach-uniphier/dram/umc-sld8.c | 1 - arch/arm/mach-uniphier/dram_init.c | 2 +- arch/arm/mach-uniphier/fdt-fixup.c | 2 +- arch/arm/mach-uniphier/memconf.c | 1 - arch/arm/mach-uniphier/micro-support-card.c | 3 ++- arch/arm/mach-uniphier/mmc-boot-mode.c | 1 - arch/arm/mach-uniphier/mmc-first-dev.c | 1 - arch/arm/mach-uniphier/pinctrl-glue.c | 1 - arch/arm/mach-uniphier/reset.c | 1 - arch/arm/mach-uniphier/sbc/sbc-ld11.c | 1 - arch/arm/mach-uniphier/sbc/sbc.c | 1 - arch/arm/mach-uniphier/spl_board_init.c | 1 - 36 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index b6e4abbad0..cde2a8124f 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <cpu_func.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index b54dc3979d..a4d260aece 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <cpu_func.h> #include <linux/bitops.h> #include <linux/delay.h> diff --git a/arch/arm/mach-uniphier/arm32/timer.c b/arch/arm/mach-uniphier/arm32/timer.c index b3c907b508..a40bdf1705 100644 --- a/arch/arm/mach-uniphier/arm32/timer.c +++ b/arch/arm/mach-uniphier/arm32/timer.c @@ -3,7 +3,7 @@ * Copyright (C) 2012-2015 Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> +#include <config.h> #include <init.h> #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/arm64/mem_map.c b/arch/arm/mach-uniphier/arm64/mem_map.c index 7653bd2d3c..a8bd4eee89 100644 --- a/arch/arm/mach-uniphier/arm64/mem_map.c +++ b/arch/arm/mach-uniphier/arm64/mem_map.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/types.h> #include <asm/armv8/mmu.h>
diff --git a/arch/arm/mach-uniphier/base-address.c b/arch/arm/mach-uniphier/base-address.c index 5ee742e363..d7456f8df6 100644 --- a/arch/arm/mach-uniphier/base-address.c +++ b/arch/arm/mach-uniphier/base-address.c @@ -3,9 +3,9 @@ // Copyright (C) 2019 Socionext Inc. // Author: Masahiro Yamada yamada.masahiro@socionext.com
-#include <common.h> #include <dm/of.h> #include <fdt_support.h> +#include <linux/errno.h> #include <linux/io.h> #include <linux/libfdt.h> #include <linux/sizes.h> diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 378aad0c9c..b800e8b8c6 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <env.h> #include <init.h> #include <spl.h> diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c index d9a8d2f28a..3e2ec9b26a 100644 --- a/arch/arm/mach-uniphier/boards.c +++ b/arch/arm/mach-uniphier/boards.c @@ -4,9 +4,9 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/libfdt.h> #include <linux/kernel.h> +#include <asm/global_data.h>
#include "init.h"
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c index 11e70a926f..4689ed79fd 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <spl.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c index 02b239475f..c6aef18c19 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <spl.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c b/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c index 55452484d9..efd07a3296 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <spl.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c index 49c5da1469..677470cdc6 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <spl.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c index 4aee50f5d3..6888099312 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <spl.h> #include <linux/bitops.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 2fb625535b..69a35f5fb8 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -4,12 +4,12 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <command.h> #include <spl.h> #include <stdio.h> #include <linux/bitops.h> #include <linux/bug.h> +#include <linux/errno.h> #include <linux/io.h> #include <linux/log2.h>
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c index c796d364bb..3b721eaf23 100644 --- a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c @@ -4,7 +4,6 @@ * Copyright (C) 2015-2017 Socionext Inc. */
-#include <common.h> #include <spl.h> #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c index b78bd01672..75d3e70d6a 100644 --- a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c +++ b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c @@ -3,7 +3,6 @@ * Copyright (C) 2016-2017 Socionext Inc. */
-#include <common.h> #include <spl.h> #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/clk-early-ld4.c b/arch/arm/mach-uniphier/clk/clk-early-ld4.c index 0f9ce65097..25b72d8926 100644 --- a/arch/arm/mach-uniphier/clk/clk-early-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-early-ld4.c @@ -4,7 +4,6 @@ * Copyright (C) 2015-2017 Socionext Inc. */
-#include <common.h> #include <spl.h> #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c index 94b9d904dc..d241a65382 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld11.c +++ b/arch/arm/mach-uniphier/clk/clk-ld11.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Socionext Inc. */
-#include <common.h> #include <spl.h> #include <linux/bitops.h> #include <linux/delay.h> diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c index fd77aa7e11..3ccaf02242 100644 --- a/arch/arm/mach-uniphier/clk/dpll-ld4.c +++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c @@ -4,7 +4,6 @@ * Copyright (C) 2015-2016 Socionext Inc. */
-#include <common.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c index c86881dabd..44006ae6dc 100644 --- a/arch/arm/mach-uniphier/clk/dpll-pro4.c +++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c @@ -4,7 +4,6 @@ * Copyright (C) 2015-2016 Socionext Inc. */
-#include <common.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c index a70ce59acc..d116d46812 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <debug_uart.h> #include <linux/io.h> #include <linux/serial_reg.h> diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c index a6c0735198..629f8b90c9 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <command.h> #include <stdio.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c index 476c5b3582..ca519d1c7e 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <command.h> #include <stdio.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c index 2d1f3e3dc0..96acca2562 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld4.c +++ b/arch/arm/mach-uniphier/dram/umc-ld4.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c index 012e5f869b..cde39b499b 100644 --- a/arch/arm/mach-uniphier/dram/umc-pro4.c +++ b/arch/arm/mach-uniphier/dram/umc-pro4.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c index b55b04415c..a11586952d 100644 --- a/arch/arm/mach-uniphier/dram/umc-sld8.c +++ b/arch/arm/mach-uniphier/dram/umc-sld8.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 1127373b20..7f2753190c 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <init.h> #include <linux/errno.h> #include <linux/io.h> @@ -13,6 +12,7 @@ #include <linux/printk.h> #include <linux/sizes.h> #include <asm/global_data.h> +#include <asm/u-boot.h>
#include "init.h" #include "sg-regs.h" diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c index 6f3c29d8c0..980c260f4c 100644 --- a/arch/arm/mach-uniphier/fdt-fixup.c +++ b/arch/arm/mach-uniphier/fdt-fixup.c @@ -4,11 +4,11 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <fdt_support.h> #include <fdtdec.h> #include <jffs2/load_kernel.h> #include <mtd_node.h> +#include <linux/errno.h> #include <linux/kernel.h> #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c index f69b489b76..57192f0154 100644 --- a/arch/arm/mach-uniphier/memconf.c +++ b/arch/arm/mach-uniphier/memconf.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 84c377766a..3bd26f26db 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -5,12 +5,13 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> +#include <config.h> #include <dm/of.h> #include <fdt_support.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/io.h> +#include <asm/global_data.h>
#include "micro-support-card.h"
diff --git a/arch/arm/mach-uniphier/mmc-boot-mode.c b/arch/arm/mach-uniphier/mmc-boot-mode.c index b48495365c..e47e5df648 100644 --- a/arch/arm/mach-uniphier/mmc-boot-mode.c +++ b/arch/arm/mach-uniphier/mmc-boot-mode.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <mmc.h> #include <spl.h>
diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c index 7f29b6bccd..45bb10f8eb 100644 --- a/arch/arm/mach-uniphier/mmc-first-dev.c +++ b/arch/arm/mach-uniphier/mmc-first-dev.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <command.h> #include <env.h> #include <mmc.h> diff --git a/arch/arm/mach-uniphier/pinctrl-glue.c b/arch/arm/mach-uniphier/pinctrl-glue.c index b45f72f59a..2e07264695 100644 --- a/arch/arm/mach-uniphier/pinctrl-glue.c +++ b/arch/arm/mach-uniphier/pinctrl-glue.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/errno.h> #include <dm.h> #include <dm/pinctrl.h> diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c index 92a8b92547..5fffd23e9a 100644 --- a/arch/arm/mach-uniphier/reset.c +++ b/arch/arm/mach-uniphier/reset.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <cpu_func.h> #include <linux/io.h> #include <asm/secure.h> diff --git a/arch/arm/mach-uniphier/sbc/sbc-ld11.c b/arch/arm/mach-uniphier/sbc/sbc-ld11.c index 21972ac949..a0162e1cc8 100644 --- a/arch/arm/mach-uniphier/sbc/sbc-ld11.c +++ b/arch/arm/mach-uniphier/sbc/sbc-ld11.c @@ -3,7 +3,6 @@ * Copyright (C) 2016-2017 Socionext Inc. */
-#include <common.h> #include <spl.h> #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/sbc/sbc.c b/arch/arm/mach-uniphier/sbc/sbc.c index af8d6f4f9d..2100f49a08 100644 --- a/arch/arm/mach-uniphier/sbc/sbc.c +++ b/arch/arm/mach-uniphier/sbc/sbc.c @@ -5,7 +5,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <linux/io.h> #include <asm/global_data.h>
diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c index 48764a1870..a93b8cdc04 100644 --- a/arch/arm/mach-uniphier/spl_board_init.c +++ b/arch/arm/mach-uniphier/spl_board_init.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada yamada.masahiro@socionext.com */
-#include <common.h> #include <debug_uart.h> #include <hang.h> #include <spl.h>
On Tue, 19 May 2020 at 21:32, Masahiro Yamada yamada.masahiro@socionext.com wrote:
<common.h> pulls in a lot of bloat. <common.h> is unneeded in most of places.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/mach-uniphier/arm32/cache-uniphier.c | 1 - arch/arm/mach-uniphier/arm32/psci.c | 1 - arch/arm/mach-uniphier/arm32/timer.c | 2 +- arch/arm/mach-uniphier/arm64/mem_map.c | 1 - arch/arm/mach-uniphier/base-address.c | 2 +- arch/arm/mach-uniphier/board_late_init.c | 1 - arch/arm/mach-uniphier/boards.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-ld11.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-ld4.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-pro5.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c | 1 - arch/arm/mach-uniphier/boot-device/boot-device.c | 2 +- arch/arm/mach-uniphier/clk/clk-dram-ld4.c | 1 - arch/arm/mach-uniphier/clk/clk-dram-pxs2.c | 1 - arch/arm/mach-uniphier/clk/clk-early-ld4.c | 1 - arch/arm/mach-uniphier/clk/clk-ld11.c | 1 - arch/arm/mach-uniphier/clk/dpll-ld4.c | 1 - arch/arm/mach-uniphier/clk/dpll-pro4.c | 1 - arch/arm/mach-uniphier/debug-uart/debug-uart.c | 1 - arch/arm/mach-uniphier/dram/cmd_ddrmphy.c | 1 - arch/arm/mach-uniphier/dram/cmd_ddrphy.c | 1 - arch/arm/mach-uniphier/dram/umc-ld4.c | 1 - arch/arm/mach-uniphier/dram/umc-pro4.c | 1 - arch/arm/mach-uniphier/dram/umc-sld8.c | 1 - arch/arm/mach-uniphier/dram_init.c | 2 +- arch/arm/mach-uniphier/fdt-fixup.c | 2 +- arch/arm/mach-uniphier/memconf.c | 1 - arch/arm/mach-uniphier/micro-support-card.c | 3 ++- arch/arm/mach-uniphier/mmc-boot-mode.c | 1 - arch/arm/mach-uniphier/mmc-first-dev.c | 1 - arch/arm/mach-uniphier/pinctrl-glue.c | 1 - arch/arm/mach-uniphier/reset.c | 1 - arch/arm/mach-uniphier/sbc/sbc-ld11.c | 1 - arch/arm/mach-uniphier/sbc/sbc.c | 1 - arch/arm/mach-uniphier/spl_board_init.c | 1 - 36 files changed, 8 insertions(+), 36 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Actually common.h is a lot better than it was.
Three years ago it was just over 1000 lines. lz4_wapper.c produced 5630 of pre-processed C. Now it is about 4000 and the list of dependencies is 72 lines instead of 91.
Yes common.h is still a problem, but I think we need to look at other headers also. For example, global_data.h includes fdtdec.h for one type, which includes lots of things. There are quite a few other headers that pull in too much stuff.
Do you know of a good way to measure this stuff automatically?
Regards, Simon
This platform completely migrated to CONFIG_DM_ETH.
board_eth_init() is only called from net/eth_legacy.c
Remove the legacy hook.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/micro-support-card.c | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 3bd26f26db..b09ec54e1f 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -107,18 +107,6 @@ void support_card_init(void) support_card_show_revision(); }
-#if defined(CONFIG_SMC911X) -#include <netdev.h> - -int board_eth_init(bd_t *bis) -{ - if (!support_card_found) - return 0; - - return smc911x_initialize(0, (unsigned long)support_card_base + SMC911X_OFFSET); -} -#endif - #if defined(CONFIG_MTD_NOR_FLASH)
#include <mtd/cfi_flash.h>
Hi Masahiro,
On Tue, 19 May 2020 at 21:32, Masahiro Yamada yamada.masahiro@socionext.com wrote:
I do not understand the change made to this file by commit 90526e9fbac4 ("common: Drop net.h from common header").
git show 90526e9fbac4 -- arch/arm/mach-uniphier/arm32/psci.c
It added <asm/cache.h> while this file does not call the standard cache functions at all.
All the uniphier-specific cache functions, uniphier_cache_*() are declared in cache-uniphier.h, which is already included from this file.
Including <asm/system.h> is sensible to fix the -Wmissing-prototypes warnings because this file defines psci_cpu_on and psci_system_reset().
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/mach-uniphier/arm32/psci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
I suspect it is a limitation of my scripting, which is not perfect. It should rely more on ctags, etc. than grep/
Reviewed-by: Simon Glass sjg@chromium.org
Regards, Simon
participants (2)
-
Masahiro Yamada -
Simon Glass