summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-05-16 17:31:07 +0200
committerArnd Bergmann <arnd@arndb.de>2023-05-26 13:33:05 +0200
commit6475f4bb3fbd24b4b2b7c41b3777a62b20b016e2 (patch)
treee5e38bd8fb9bc1a7f0ff9bb8978ed64d4bb4a35b
parenta9ae9c526cc232b69b0bc9d668e303c90600e848 (diff)
ARM: sa1100: address missing prototype warnings
There are three warnings for mach-sa1100 when building with W=1: arch/arm/common/sa1111.c:699:1: error: no previous prototype for 'sa1111_configure_smc' [-Werror=missing-prototypes] 699 | sa1111_configure_smc(struct sa1111 *sachip, int sdram, unsigned int drac, | ^~~~~~~~~~~~~~~~~~~~ arch/arm/mach-sa1100/assabet.c:718:13: error: no previous prototype for 'assabet_init_irq' [-Werror=missing-prototypes] 718 | void __init assabet_init_irq(void) | ^~~~~~~~~~~~~~~~ arch/arm/mach-sa1100/pm.c:126:12: error: no previous prototype for 'sa11x0_pm_init' [-Werror=missing-prototypes] 126 | int __init sa11x0_pm_init(void) | ^~~~~~~~~~~~~~ The first two are only used locally and can be 'static', while the last one needs to include the right header. Link: https://lore.kernel.org/r/20230516153109.514251-12-arnd@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/common/sa1111.c2
-rw-r--r--arch/arm/mach-sa1100/assabet.c2
-rw-r--r--arch/arm/mach-sa1100/pm.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index aad6ba236f0f..77c83ba81715 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -695,7 +695,7 @@ static u32 sa1111_dma_mask[] = {
/*
* Configure the SA1111 shared memory controller.
*/
-void
+static void
sa1111_configure_smc(struct sa1111 *sachip, int sdram, unsigned int drac,
unsigned int cas_latency)
{
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index d000c678b439..2b833aa0212b 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -710,7 +710,7 @@ static void __init assabet_map_io(void)
sa1100_register_uart(2, 3);
}
-void __init assabet_init_irq(void)
+static void __init assabet_init_irq(void)
{
u32 def_val;
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 9a7079f565bd..0c21ef45db68 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -33,6 +33,8 @@
#include <asm/suspend.h>
#include <asm/mach/time.h>
+#include "generic.h"
+
extern int sa1100_finish_suspend(unsigned long);
#define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x