From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 20 May 2020 03:31:23 +0000 (+0900)
Subject: ARM: uniphier: include <asm/system.h> instead of <asm/cache.h> from psci.c
X-Git-Tag: v2020.07-rc3~8^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f49049a8ec46ff00ddd8f023bf0b5935b5317865;p=oweals%2Fu-boot.git

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

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"