From patchwork Wed Sep 13 14:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp30635vqi; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrwNEk1yVdVMkbVnz2M2OXoz8RIYGQxxLWpdNYV4vR/Vsg92boEaLrmbrUNU7Q86OVshG4 X-Received: by 2002:a05:6102:152:b0:44e:9afe:c5b2 with SMTP id a18-20020a056102015200b0044e9afec5b2mr4082205vsr.27.1694652791436; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694652791; cv=none; d=google.com; s=arc-20160816; b=hcnXdRq65t8hvtppbV0tkRU5l8PehDsbhg5d4e1bufigwE2WvQTL6T2uJg4pEy4LG7 Tee+985kev6aFc5C/9aUJwX3+ZWQ5J5wg3YpF2j4k7ykiUI+vdYIi3JK+C6wSYHvE3ns 78OOkyZ+naPZwBcJ218XMgv/+ZL9Rokp0/jw7MzfjxVtOj3GlH1vyL08Bm0GSDIkMWg2 AOKWTC3GSF0D6+zHO9G6E/duU5D2wlzJvL/6R9WxwdI5HWc5UTb4/+F8UMvBJfi8dikJ MiqX57iJVaCCOsRdZ8AmnTH6FA4Ae3EaCTd6A13r/DYxwF/mJL9unrSItCqobHGB5YJf T2fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=bL881H0lOn1n072B8y/4weXc2n/LZBgihTxVtIPYegg=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=b3ZJmqM0IroZM9oDfhgmr7ZkRAsutGPjNkJllv564LSXU3jc0Bp4sdyr8NvIWE29JU FqUwHRgKFbPh8hNnKTLpM1CaeK4kkwWmLVVJLA2p22YCvglwkebfOicSR+4EqaAlODmR bZNF8YtYu9ggiliufLIqeRe1QoqDjeOYcgq11TDamPJ7QNn2Eo+jJnAQXP2THN1do/vD 1dkY5aVd+f24lnIQZwDxjP91UhSU2CBQ83D1lkoA9VLs3ve7PP3FdZtfJYducjzwx/fp a7niPlnicYDf3ercBWwXOM2f8H9lRKi3onnfG4kaVqUI04IK/qtTTp+rbge4RXgYvHsI 6zLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id r135-20020a632b8d000000b00553867efc1bsi321948pgr.636.2023.09.13.17.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 17:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A70618030B8A; Wed, 13 Sep 2023 07:11:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241712AbjIMOK5 (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241502AbjIMOKD (ORCPT ); Wed, 13 Sep 2023 10:10:03 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB3762121 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by michel.telenet-ops.be with bizsmtp id lS8p2A00T3fvA4V06S8qJW; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cs1-Kx; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV4i-0C; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 17/52] m68k: amiga: Add and use "amiga.h" Date: Wed, 13 Sep 2023 16:08:07 +0200 Message-Id: <7e9395e1de1c9a34d16ea40a522057f05bbee400.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776972245382243647 X-GMAIL-MSGID: 1776972245382243647 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 Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/amiga/amiga.h | 5 +++++ arch/m68k/amiga/amisound.c | 2 ++ arch/m68k/amiga/config.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 arch/m68k/amiga/amiga.h diff --git a/arch/m68k/amiga/amiga.h b/arch/m68k/amiga/amiga.h new file mode 100644 index 0000000000000000..00392781442cb91a --- /dev/null +++ b/arch/m68k/amiga/amiga.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* amisound.c */ +void amiga_init_sound(void); +void amiga_mksound(unsigned int hz, unsigned int ticks); diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index 442bdeee6bd7920c..714fe8ec6afa3364 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c @@ -16,6 +16,8 @@ #include +#include "amiga.h" + static unsigned short *snd_data; static const signed char sine_data[] = { 0, 39, 75, 103, 121, 127, 121, 103, 75, 39, diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 3137b45750dfcea7..7791673e547bf795 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -39,6 +39,8 @@ #include #include +#include "amiga.h" + static unsigned long amiga_model; unsigned long amiga_eclock; @@ -96,9 +98,7 @@ static char amiga_model_name[13] = "Amiga "; static void amiga_sched_init(void); static void amiga_get_model(char *model); static void amiga_get_hardware_list(struct seq_file *m); -extern void amiga_mksound(unsigned int count, unsigned int ticks); static void amiga_reset(void); -extern void amiga_init_sound(void); static void amiga_mem_console_write(struct console *co, const char *b, unsigned int count); #ifdef CONFIG_HEARTBEAT