Skip to content

Commit 090c656

Browse files
committed
m68k: amiga: Add and use "amiga.h"
When building with W=1: arch/m68k/amiga/amisound.c:48:13: warning: no previous prototype for ‘amiga_init_sound’ [-Wmissing-prototypes] 48 | void __init amiga_init_sound(void) | ^~~~~~~~~~~~~~~~ arch/m68k/amiga/amisound.c:71:6: warning: no previous prototype for ‘amiga_mksound’ [-Wmissing-prototypes] 71 | void amiga_mksound( unsigned int hz, unsigned int ticks ) | ^~~~~~~~~~~~~ Fix this by introducing a new header file "amiga.h" for holding the prototypes of functions implemented in arch/m68k/amiga/. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/7e9395e1de1c9a34d16ea40a522057f05bbee400.1694613528.git.geert@linux-m68k.org
1 parent ac0b559 commit 090c656

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

arch/m68k/amiga/amiga.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
3+
/* amisound.c */
4+
void amiga_init_sound(void);
5+
void amiga_mksound(unsigned int hz, unsigned int ticks);

arch/m68k/amiga/amisound.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include <asm/amigahw.h>
1818

19+
#include "amiga.h"
20+
1921
static unsigned short *snd_data;
2022
static const signed char sine_data[] = {
2123
0, 39, 75, 103, 121, 127, 121, 103, 75, 39,

arch/m68k/amiga/config.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
#include <asm/io.h>
4040
#include <asm/config.h>
4141

42+
#include "amiga.h"
43+
4244
static unsigned long amiga_model;
4345

4446
unsigned long amiga_eclock;
@@ -96,9 +98,7 @@ static char amiga_model_name[13] = "Amiga ";
9698
static void amiga_sched_init(void);
9799
static void amiga_get_model(char *model);
98100
static void amiga_get_hardware_list(struct seq_file *m);
99-
extern void amiga_mksound(unsigned int count, unsigned int ticks);
100101
static void amiga_reset(void);
101-
extern void amiga_init_sound(void);
102102
static void amiga_mem_console_write(struct console *co, const char *b,
103103
unsigned int count);
104104
#ifdef CONFIG_HEARTBEAT

0 commit comments

Comments
 (0)