Skip to content

Commit 6475f4b

Browse files
committed
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>
1 parent a9ae9c5 commit 6475f4b

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

arch/arm/common/sa1111.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ static u32 sa1111_dma_mask[] = {
695695
/*
696696
* Configure the SA1111 shared memory controller.
697697
*/
698-
void
698+
static void
699699
sa1111_configure_smc(struct sa1111 *sachip, int sdram, unsigned int drac,
700700
unsigned int cas_latency)
701701
{

arch/arm/mach-sa1100/assabet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ static void __init assabet_map_io(void)
710710
sa1100_register_uart(2, 3);
711711
}
712712

713-
void __init assabet_init_irq(void)
713+
static void __init assabet_init_irq(void)
714714
{
715715
u32 def_val;
716716

arch/arm/mach-sa1100/pm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include <asm/suspend.h>
3434
#include <asm/mach/time.h>
3535

36+
#include "generic.h"
37+
3638
extern int sa1100_finish_suspend(unsigned long);
3739

3840
#define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x

0 commit comments

Comments
 (0)