From patchwork Fri Jan 21 20:07:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1582789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JgVmz4PRRz9sXM for ; Sat, 22 Jan 2022 07:08:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232636AbiAUUIQ (ORCPT ); Fri, 21 Jan 2022 15:08:16 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:52991 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231827AbiAUUIN (ORCPT ); Fri, 21 Jan 2022 15:08:13 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MVNF1-1mkzAb0Dwd-00SLOK; Fri, 21 Jan 2022 21:07:46 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: linux-rtc@vger.kernel.org, Alessandro Zummo , Jiaxun Yang , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Arnd Bergmann , Thomas Gleixner , Daniel Lezcano , Stephen Boyd , Alexandre Belloni , John Stultz , Laurent Vivier Subject: [PATCH v12 1/5] m68k: add asm/config.h Date: Fri, 21 Jan 2022 21:07:34 +0100 Message-Id: <20220121200738.2577697-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121200738.2577697-1-laurent@vivier.eu> References: <20220121200738.2577697-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:OIDmOGtwQXtW9fmX1E/i4EtY6lcyqoxCtuqyTjom3FKQbEW9nk9 AlIUsYOPTnXNX/lrc8yG4jN89T9LxkZGBvKhw7agTDzasz+Du/7dow755YymF1tPSGLMeOk 5nPnYIJgs2Fe1TicYQpMmDusUGjynIV4l9d1c46HsCJKTRI/sZR2WbLsQKA14DqfEI9GuME vjnVzTVB8AwrSAUT1VE7Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:bKc0EppmtSA=:5nFch7H8CAIJtsgMV1xYp5 UfgAtxhum4TTlJer7/qil5frhr65HR688SIjdLfxIg2rzGhDMh9MYwSR2kMeu0KJ3yr2k+qKN Ksli45so6MyYUWmh/ygLFhyG69yqZchWlUf09b7k/9f6FZ/F5Zg7YwGYdzWd7h0/gu0xySozX 4n8zQrri2IRzg7crSgDLqgdyeycWDFDxIxbnXONeFy0S06UreKZWz0sUS20gZmpf0AkWybxdu zj7BAUTU+3bP5RAzkVSdV9+Zgc4webswXSf/REVnDTBm+hqoUZiJK5EK3btOw4CvmgiLVDug6 Z8QtXXkO/1U1vFkul1Jc135XO2SAsGXA1oHwaEn5LAO9oUNcs4Usf+iC/5M+b2Ai2UBm28OK/ ir15onkjLm4P73QY68Dq32IRrInVYv17a7WAJxzjUdGxccTdfQkGoFy+sD1KklfC3Nvus9tvW /unTQd538O96HtG6IGN8Cu3wvr0FQcSHbTSkDDsibzJ1rh4cg4+Npvv7eCPglhzd48GgoOh0/ 96hXBNS8ja8DCdLoeA88j0fH1CUUCzc2KT4CVpKG0TSoScG55Kr5C/aFsGDyU9x0fU/ivgJ5X nE8w8doyaWWREIsODPRwZvxoYdcnlpTehbohwUt7IbvGECZ5o47SlxGR3XNthZqfGmU3x0cFs vHqVYiNyyGVtIaTZ3oWmX6Sa6zbxJERD9rmhpiEIlYaLpYQBjItZUG0o7ZgTza2k4BRs= Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org To avoid 'warning: no previous prototype for' error, declare all the parse_bootinfo and config functions prototypes into asm/config.h and include it in arch/m68k/kernel/setup_mm.c and arch/m68k/*/config.c Signed-off-by: Laurent Vivier Reviewed-by: Geert Uytterhoeven --- arch/m68k/amiga/config.c | 1 + arch/m68k/apollo/config.c | 1 + arch/m68k/atari/config.c | 1 + arch/m68k/bvme6000/config.c | 1 + arch/m68k/hp300/config.c | 1 + arch/m68k/include/asm/config.h | 33 +++++++++++++++++++++++++++++++++ arch/m68k/kernel/setup_mm.c | 23 +---------------------- arch/m68k/mac/config.c | 1 + arch/m68k/mvme147/config.c | 1 + arch/m68k/mvme16x/config.c | 1 + arch/m68k/q40/config.c | 1 + 11 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 arch/m68k/include/asm/config.h diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index be2dfab48fd4..3137b45750df 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -37,6 +37,7 @@ #include #include #include +#include static unsigned long amiga_model; diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 581a5f68d102..42a8b8e2b664 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -16,6 +16,7 @@ #include #include #include +#include u_long sio01_physaddr; u_long sio23_physaddr; diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 261a0f57cc9a..38a7c0578105 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -46,6 +46,7 @@ #include #include #include +#include u_long atari_mch_cookie; EXPORT_SYMBOL(atari_mch_cookie); diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 0c6feafbbd11..9b060d466e03 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c @@ -36,6 +36,7 @@ #include #include #include +#include static void bvme6000_get_model(char *model); extern void bvme6000_sched_init(void); diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index ce1eb3d3d55d..2c92843397c3 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c @@ -22,6 +22,7 @@ #include #include /* readb() and writeb() */ #include +#include #include "time.h" diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h new file mode 100644 index 000000000000..aae61070628b --- /dev/null +++ b/arch/m68k/include/asm/config.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * This file contains prototypes provided by each m68k machine + * to parse bootinfo data structures and to configure the machine + */ + +#ifndef _M68K_CONFIG_H +#define _M68K_CONFIG_H + +extern int amiga_parse_bootinfo(const struct bi_record *record); +extern int atari_parse_bootinfo(const struct bi_record *record); +extern int mac_parse_bootinfo(const struct bi_record *record); +extern int q40_parse_bootinfo(const struct bi_record *record); +extern int bvme6000_parse_bootinfo(const struct bi_record *record); +extern int mvme16x_parse_bootinfo(const struct bi_record *record); +extern int mvme147_parse_bootinfo(const struct bi_record *record); +extern int hp300_parse_bootinfo(const struct bi_record *record); +extern int apollo_parse_bootinfo(const struct bi_record *record); + +extern void config_amiga(void); +extern void config_atari(void); +extern void config_mac(void); +extern void config_sun3(void); +extern void config_apollo(void); +extern void config_mvme147(void); +extern void config_mvme16x(void); +extern void config_bvme6000(void); +extern void config_hp300(void); +extern void config_q40(void); +extern void config_sun3x(void); + +#endif /* _M68K_CONFIG_H */ diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 49e573b94326..8228275aae3e 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -47,6 +47,7 @@ #endif #include #include +#include #if !FPSTATESIZE || !NR_IRQS #warning No CPU/platform type selected, your kernel will not work! @@ -113,28 +114,6 @@ EXPORT_SYMBOL(isa_type); EXPORT_SYMBOL(isa_sex); #endif -extern int amiga_parse_bootinfo(const struct bi_record *); -extern int atari_parse_bootinfo(const struct bi_record *); -extern int mac_parse_bootinfo(const struct bi_record *); -extern int q40_parse_bootinfo(const struct bi_record *); -extern int bvme6000_parse_bootinfo(const struct bi_record *); -extern int mvme16x_parse_bootinfo(const struct bi_record *); -extern int mvme147_parse_bootinfo(const struct bi_record *); -extern int hp300_parse_bootinfo(const struct bi_record *); -extern int apollo_parse_bootinfo(const struct bi_record *); - -extern void config_amiga(void); -extern void config_atari(void); -extern void config_mac(void); -extern void config_sun3(void); -extern void config_apollo(void); -extern void config_mvme147(void); -extern void config_mvme16x(void); -extern void config_bvme6000(void); -extern void config_hp300(void); -extern void config_q40(void); -extern void config_sun3x(void); - #define MASK_256K 0xfffc0000 extern void paging_init(void); diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 5d16f9b47aa9..65d124ec80bb 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -47,6 +47,7 @@ #include #include #include +#include /* Mac bootinfo struct */ struct mac_booter_data mac_bi_data; diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index dfd6202fd403..b96ea7c76a19 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c @@ -34,6 +34,7 @@ #include #include #include +#include static void mvme147_get_model(char *model); diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index b4422c2dfbbf..88cbdc10925b 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -37,6 +37,7 @@ #include #include #include +#include extern t_bdid mvme_bdid; diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 5caf1e5be1c2..9237243077ce 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -34,6 +34,7 @@ #include #include #include +#include extern void q40_init_IRQ(void); static void q40_get_model(char *model);