From patchwork Tue May 16 19:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94897 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp665842vqo; Tue, 16 May 2023 12:54:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kdPJEkF6YxVOY46a2gYey3C0EBEQaWxDq8hHSvPCMmUh7C0vp7qZRA/wXAvAHtHLAcjRn X-Received: by 2002:a05:6a00:2e18:b0:638:7e00:3737 with SMTP id fc24-20020a056a002e1800b006387e003737mr48874287pfb.23.1684266891078; Tue, 16 May 2023 12:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684266891; cv=none; d=google.com; s=arc-20160816; b=evvC5egHMHFasIqFekkQPkSYiyi2FH0To6QVnPB6osDW6k/5llc+tvWo5F28dvyfbp yv5c4huj0fQ7Ju0O1KDOwZsol/we3ZFMobQ0FVtVx+rRj9LH41XhZkZFSkR/y5rPz1TU +ngaJzX1eUiOlgLOnWdFL7YUgJ6p9Pzt7kMXFIhS0cdqnfEukHYRVhPWi65cPGjZGVW2 gjLVk5+0s6/2hxWXXn9eexOQ2PIuys6nZl5Fu4Gn3fVRi5uHVlW5F/wsQxu/JXaFctTB OFgoP30WvCMR4Zd12wUhq2p5xA52jFA7xArCQ71oKMvKHUjlku400Ut3leAVG+S6mgsM 9Iww== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=ED/jBwer7vyE1muiDyEZ793ygA4d5HxNXCL9KipRIV8=; b=uvTZ2cd1ay4j0xYVWhqNhCPUvQ8AXfIqkK42ngPE/VxO1uvHYrsik/mzv/jZ8AjYx7 EdCiF2p4bJZw6MYs+o65qNRcoteAz/gss7jPyvr5LCkCOYzmqAd24PVDtJY480Fwv7LM UI5eyd6LNzff+iVZYlRURHC+eJor8p22hxlTagVHn4GT8DK2xId/KTFx2c+mV1AKfU3v 0V2qSgXiGcboPlr5LturmrBPOJF/H+QARuHzKEeriZTk8LDHsYdNCEWdQqb/YaHgO38D VwPJtM12ZrCTXpvLBSMQBbPvxRWPY1Dmm3kAsM64Nb7NEnx/FkXldC5O1CwH8nqO+nCk GQyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lZKVR+LO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y8-20020aa793c8000000b0063732344e2fsi19792587pff.190.2023.05.16.12.54.38; Tue, 16 May 2023 12:54:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lZKVR+LO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbjEPTqe (ORCPT + 99 others); Tue, 16 May 2023 15:46:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjEPTqd (ORCPT ); Tue, 16 May 2023 15:46:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EA22A9 for ; Tue, 16 May 2023 12:46:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0A2CF6395C for ; Tue, 16 May 2023 19:46:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3BAFC433D2; Tue, 16 May 2023 19:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684266391; bh=DxI/UVhN0q2eJvXWiZ5VpavVr0sLMAGgJy7XONqqNTI=; h=From:To:Cc:Subject:Date:From; b=lZKVR+LO8BsQXXksU3lzecsMdCysi6jhPwGOc/TVemZ2b3rPKPWtZ/LYnR4Nckjpl Ltr84WhXcxbefIYu5DutkFEHN5YgnipvtkphFCMBevbtzxvAj6/d8VlrVRU+s/chK2 xwxeW0A0uzQ7kJSQdiLXmares8h3DSqArOdgms4YDMB4zoMQ/tpasN7CuBK/fzJ0cd Ath6e7Sy7v6g8EYYsRTcF3oeMG1U90krJbg4cQABH3TTjOq20j4o0vCicD9ph/YeA9 BovZrigvhzuPVkcmRYWSBo0OXgcwSB8J4682xDU1S4pf6VBAmuHWx5N3wAsj/UiOW3 qjMyFtY+tYKkQ== From: Arnd Bergmann To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] net: isa: include net/Space.h Date: Tue, 16 May 2023 21:45:33 +0200 Message-Id: <20230516194625.549249-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766081839255649393?= X-GMAIL-MSGID: =?utf-8?q?1766081839255649393?= From: Arnd Bergmann The legacy drivers that still get called from net/Space.c have prototypes in net/Space, but this header is not included in most of the files that define those functions: drivers/net/ethernet/cirrus/cs89x0.c:1649:28: error: no previous prototype for 'cs89x0_probe' [-Werror=missing-prototypes] drivers/net/ethernet/8390/ne.c:947:28: error: no previous prototype for 'ne_probe' [-Werror=missing-prototypes] drivers/net/ethernet/8390/smc-ultra.c:167:28: error: no previous prototype for 'ultra_probe' [-Werror=missing-prototypes] drivers/net/ethernet/amd/lance.c:438:28: error: no previous prototype for 'lance_probe' [-Werror=missing-prototypes] drivers/net/ethernet/3com/3c515.c:422:20: error: no previous prototype for 'tc515_probe' [-Werror=missing-prototypes] Add the inclusion to avoids the warnings. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/3com/3c515.c | 4 +++- drivers/net/ethernet/8390/ne.c | 1 + drivers/net/ethernet/8390/smc-ultra.c | 1 + drivers/net/ethernet/8390/wd.c | 1 + drivers/net/ethernet/amd/lance.c | 1 + drivers/net/ethernet/cirrus/cs89x0.c | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index d2f4358cc550..ba3e7aa1a28f 100644 --- a/drivers/net/ethernet/3com/3c515.c +++ b/drivers/net/ethernet/3com/3c515.c @@ -66,8 +66,10 @@ static int max_interrupt_work = 20; #include #include #include - #include + +#include + #include #include diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index 0a9118b8be0c..bc9c81dc00fd 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -52,6 +52,7 @@ static const char version2[] = #include #include #include +#include #include diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c index 6e62c37c9400..7465650c8078 100644 --- a/drivers/net/ethernet/8390/smc-ultra.c +++ b/drivers/net/ethernet/8390/smc-ultra.c @@ -66,6 +66,7 @@ static const char version[] = #include #include #include +#include #include #include diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c index 5b00c452bede..119021d41451 100644 --- a/drivers/net/ethernet/8390/wd.c +++ b/drivers/net/ethernet/8390/wd.c @@ -37,6 +37,7 @@ static const char version[] = #include #include #include +#include #include diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c index 8971665a4b2a..6cf38180cc01 100644 --- a/drivers/net/ethernet/amd/lance.c +++ b/drivers/net/ethernet/amd/lance.c @@ -59,6 +59,7 @@ static const char version[] = "lance.c:v1.16 2006/11/09 dplatt@3do.com, becker@c #include #include #include +#include #include #include diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index 06a0c00af99c..276c32c3926a 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c @@ -72,6 +72,8 @@ #include #include +#include + #include #include #if ALLOW_DMA From patchwork Tue May 16 19:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp665904vqo; Tue, 16 May 2023 12:55:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QZGs/9vaWnFEZRvtAfayVWhFezSeCG553jFTcTo9AEJvao39aVD8sZgO4JsSRNUcoujAJ X-Received: by 2002:a05:6a20:12cb:b0:104:1ab7:8242 with SMTP id v11-20020a056a2012cb00b001041ab78242mr22504969pzg.43.1684266899899; Tue, 16 May 2023 12:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684266899; cv=none; d=google.com; s=arc-20160816; b=dLgwfRgcx8h2wwMJCooNqFU6ZtSJjZwsDiNrFe8tW2BCmO8uGjjQL9lS7rKNVN3X0T RdufcRW+qaHxhvHLnRa85c997WT1QliY72RS7bfH7xz/3HzWtc1GY24g6t0SRiItJGjg lucEdwFSLcC+qsmMdA9mEgXLbl8Ro2oEcQjtNADgQcM/BkmPgVB9horftlqCoWutyG3z OWpiePom1/eLE2HUWmcYdOMTUMjhPBsfWAOMbNrM5vq/9a56f661mLM0gX6oG8AFIv0O cv5DcfHjnxe8YpaJ2w0MbdtxclMPpTW2IMfyxdHLlVBu/HWrXsbSj34lcWjfyJgEbNJj CQuw== 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 :dkim-signature; bh=E1hujHLviDGxuswpWgYEWFYXTyDR/AVj4cdAvsE8yTg=; b=NnJzB1ha5yg7RvpNOYdE2eXXdrWwImY6LHraBvplSV1NCHZMcGMYPNeV62KwGWSs++ eMtyN9dpRVTEL1PcuY5kTdsBa0j4bTOH+oB50JE+lNVeY4ySjHyYQsLzcQ38TcSEPLy1 PTLlE4I2XhFyihFJOOjsHKr8mgLoBAZcEKBN1xaeS7sL3kt+uuGx0AwlBorId8FESvIB mDf6NXMm4TZfIPHPZSDTDThDrr0o9N/zkN7YYLZ3wJC64P1wpwmfr1Vr+zvBJL3IsS0X zBtlbGLKHFOLssqQunt4d5tm78+8PeMOlxWASwBZSWchSd4L5KsPmQA1LnWs0H0/SLVB nhvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="loFs/j/K"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b5-20020a639305000000b0052ca3209fc9si19717606pge.654.2023.05.16.12.54.46; Tue, 16 May 2023 12:54:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="loFs/j/K"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229944AbjEPTqn (ORCPT + 99 others); Tue, 16 May 2023 15:46:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229869AbjEPTqm (ORCPT ); Tue, 16 May 2023 15:46:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C600E66 for ; Tue, 16 May 2023 12:46:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0C723635A1 for ; Tue, 16 May 2023 19:46:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C80EAC433EF; Tue, 16 May 2023 19:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684266400; bh=/xw8L/SqM7J5+dB7LsHWwXKvpp+WooOj5QzCg+QboCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=loFs/j/KwTSIPj1772KxBpDHgWJJ2vaLRapiw5FjTF4PabYT16JDupLW+SSGmRpf1 wCfewaZ3l0WoTJRovGojaLEA+HxlJ1NW45LcbWix6XzWOmHyPzvBAybAIbjtrhFERg WrOFlPQNpCh2GpB+sRNgOKrAqZsmYy31q+0kOkA1uWk2a+Dz63iuOnaI3jcN1M2ChW 0JN9odgtd1dNcOIlPE2384QQyALu//fAB9uQ+pQG0a9tBG1UjTym2EYq3MRePy4qCZ XNWzpQQSX1y3BYj2VVPgldVCKuO/P4BXEl9UEsv8ecAHFhOT/duQ8z6RE7yik7OAvc jARhqLL/RZqdw== From: Arnd Bergmann To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] atm: hide unused procfs functions Date: Tue, 16 May 2023 21:45:34 +0200 Message-Id: <20230516194625.549249-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516194625.549249-1-arnd@kernel.org> References: <20230516194625.549249-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766081848813636492?= X-GMAIL-MSGID: =?utf-8?q?1766081848813636492?= From: Arnd Bergmann When CONFIG_PROC_FS is disabled, the function declarations for some procfs functions are hidden, but the definitions are still build, as shown by this compiler warning: net/atm/resources.c:403:7: error: no previous prototype for 'atm_dev_seq_start' [-Werror=missing-prototypes] net/atm/resources.c:409:6: error: no previous prototype for 'atm_dev_seq_stop' [-Werror=missing-prototypes] net/atm/resources.c:414:7: error: no previous prototype for 'atm_dev_seq_next' [-Werror=missing-prototypes] Add another #ifdef to leave these out of the build. Signed-off-by: Arnd Bergmann --- net/atm/resources.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/atm/resources.c b/net/atm/resources.c index 2b2d33eeaf20..995d29e7fb13 100644 --- a/net/atm/resources.c +++ b/net/atm/resources.c @@ -400,6 +400,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *buf, int __user *sioc_len, return error; } +#ifdef CONFIG_PROC_FS void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos) { mutex_lock(&atm_dev_mutex); @@ -415,3 +416,4 @@ void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) { return seq_list_next(v, &atm_devs, pos); } +#endif From patchwork Tue May 16 19:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp671633vqo; Tue, 16 May 2023 13:05:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4a/PHuSnQnQRgwkYgeFy+5GRPAysotzp+xQu5sLf3aobvYOYJIQ6AdhT1RbSBOSy3ULlTI X-Received: by 2002:a17:90a:6a8e:b0:234:ba34:71bf with SMTP id u14-20020a17090a6a8e00b00234ba3471bfmr39081527pjj.1.1684267501837; Tue, 16 May 2023 13:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684267501; cv=none; d=google.com; s=arc-20160816; b=hjt2ev0rWswGyYNbPK+VQA8i0GTi1ifw0rbgvvA8ZJlMnRaHMTHDcsfUqq2RcRvw37 WTAh66R2t5t62AHKnak1Wwe2/fLRma7hyBcYfP+jdkLg5vRZSTnW2Givi9OqoM5KYazK eQCaDmwlfv3grqTNMWhhrhcSPTAmfcBiNzgfa5abNBKN24FR9DGbA97UNqL+Bqc8GDrC 4I7AwGVFAggIdZSB7qUfF/SVmN30FbLMw5RW5OzPrq23lv3Dy+0GvC9BgSc8hAEjoJ/G eXMVdJftOVAcL9Ks8fpFemT/phoxnlpHWIlrwU1k2mQSbpGTvz3fYAIquNEin2nE6vSx wE9A== 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 :dkim-signature; bh=gFXbfEXdTaR1+1v/q0b5kY93yApHEhjhScmgB/Sis/E=; b=awjh4E+Yn8vofBwkbYkpehHJbi3IHQxrt36ynxS8qwKq304ECP13XtJHfYevqroah1 R8BfRv+zC/TgZ5xpUksQu2avzlHn3CubdsU6cbIcroe4tetZReYwMVg9T1m+qfNY5MYX FfEs3jKNpuUkg/ZWhm3zzOsfZ9Wm5GoBK2axtKjFDXnJZ/7cw7kD9rqZeu1hD7R9TvVu 80kR5ZO1AWO753dqwI0PtCJY2esG6nzXvFj6huEG8G5Un2+s383t1q3d3CAZhcVd1y46 YvqO/a0hRGTwjPd0xIE2iXtaQsKifu28JQ4FH+qABNsoV17kdu/wYzKBKdYq/0fr1I+6 W2Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CYoYaBX+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id em22-20020a17090b015600b0024df18639fasi160241pjb.154.2023.05.16.13.04.29; Tue, 16 May 2023 13:05:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CYoYaBX+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbjEPTq6 (ORCPT + 99 others); Tue, 16 May 2023 15:46:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229491AbjEPTq5 (ORCPT ); Tue, 16 May 2023 15:46:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0A24468B for ; Tue, 16 May 2023 12:46:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4F7B563D0B for ; Tue, 16 May 2023 19:46:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 832C2C433D2; Tue, 16 May 2023 19:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684266412; bh=Retqq5JfF+1v3Y0juT8ukUupAtMcuR+tzDBH2kPz0nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CYoYaBX+m/LPk4VBRp8JNpVscrno+XDoOxsbtT049WnQxI9/kSv1bR5kiaTmgxUUy yyC7zNWfHk1n1+Bj8Et1dY92a6p0p51q4zMvCDb9u/iIFhC965iehJ9+OHPWqp9bok 8fR9wBQWSjY95WV68eJL+MIsjiuxWDC3uu+Jjzd0BE4+In115Zc1eGavYGPScFq5OB 6WFmKjetm6poZK2aA6o+B7/MSKLwV/Sim4gAPGVazWEZDClKW9/9Ibhr3Xv7uzOEp1 5qU0+8VwZdehpR7d99IB8cS41Y3EeSlnta9+f3e9RwtJ+zwAvcGzKZJEpKMztEPuVn DkgRIf/FWV1mw== From: Arnd Bergmann To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Arnd Bergmann , Roopa Prabhu , Nikolay Aleksandrov , bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] bridge: always declare tunnel functions Date: Tue, 16 May 2023 21:45:35 +0200 Message-Id: <20230516194625.549249-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516194625.549249-1-arnd@kernel.org> References: <20230516194625.549249-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766082480024766607?= X-GMAIL-MSGID: =?utf-8?q?1766082480024766607?= From: Arnd Bergmann When CONFIG_BRIDGE_VLAN_FILTERING is disabled, two functions are still defined but have no prototype or caller. This causes a W=1 warning for the missing prototypes: net/bridge/br_netlink_tunnel.c:29:6: error: no previous prototype for 'vlan_tunid_inrange' [-Werror=missing-prototypes] net/bridge/br_netlink_tunnel.c:199:5: error: no previous prototype for 'br_vlan_tunnel_info' [-Werror=missing-prototypes] The functions are already contitional on CONFIG_BRIDGE_VLAN_FILTERING, and I coulnd't easily figure out the right set of #ifdefs, so just move the declarations out of the #ifdef to avoid the warning, at a small cost in code size over a more elaborate fix. Signed-off-by: Arnd Bergmann Acked-by: Nikolay Aleksandrov --- net/bridge/br_private_tunnel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_private_tunnel.h b/net/bridge/br_private_tunnel.h index 2b053289f016..efb096025151 100644 --- a/net/bridge/br_private_tunnel.h +++ b/net/bridge/br_private_tunnel.h @@ -27,6 +27,10 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, int br_get_vlan_tunnel_info_size(struct net_bridge_vlan_group *vg); int br_fill_vlan_tunnel_info(struct sk_buff *skb, struct net_bridge_vlan_group *vg); +bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr, + const struct net_bridge_vlan *v_last); +int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd, + u16 vid, u32 tun_id, bool *changed); #ifdef CONFIG_BRIDGE_VLAN_FILTERING /* br_vlan_tunnel.c */ @@ -43,10 +47,6 @@ void br_handle_ingress_vlan_tunnel(struct sk_buff *skb, struct net_bridge_vlan_group *vg); int br_handle_egress_vlan_tunnel(struct sk_buff *skb, struct net_bridge_vlan *vlan); -bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr, - const struct net_bridge_vlan *v_last); -int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd, - u16 vid, u32 tun_id, bool *changed); #else static inline int vlan_tunnel_init(struct net_bridge_vlan_group *vg) { From patchwork Tue May 16 19:45:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94899 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp671463vqo; Tue, 16 May 2023 13:04:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5BjU+8T/1KNqxCRwILQzHpHLiNZ9qHkOzr6P3kZLpLEEK/mLLN7Ar4E0UThyKo3jZjfr68 X-Received: by 2002:a17:90a:d988:b0:24e:20d9:4e5b with SMTP id d8-20020a17090ad98800b0024e20d94e5bmr40215416pjv.9.1684267484940; Tue, 16 May 2023 13:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684267484; cv=none; d=google.com; s=arc-20160816; b=04eU6XgU5/7+ES30F0K32zxL5R5XIrfhbEszd8MaxxoUYuObgDa5B423f9Ay+8HpCB zG0oBPdPanp+pd9aYOj3wXM917Jv2XJjCKlGF0NfFTrnnxKrZmQ6GI4jVe/7Fg8Q5s2f c5/CcIbceP1klUpqr8fP3ZNwqnX9xp/FMexARaNoRzxJ9sGJgY21x093Niol5fNcZ3Tn P+z7QSEKmVdw1MuiEqlB9nxRWUxjFuxivOjZYqt6TzXTi9N3l2obEvdLVi/D+MGEKy3Z tk+gpN7nPPvtOLHE79MYuugVhO1Xn8OT2WIpeEsa9/Ax3QSoPi1jr+ZgsEbOZFAZWP7Y /01A== 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 :dkim-signature; bh=GOfAk4TsO3LJElyrTiCRwCLim4zL2ianNqmw9RGri0w=; b=aUsRpP4LahWyUBLRaR6B/Aw0OP6jmb/LztDOmDJvYGh6j5Fwg7pOHVQi2Vyggt7VfY Ay1LgJVrdNN3zInWKjsKhMxM4jQiP1Mf/mJNt0ZZhIJlzealZ3F/82tcatcWHuKAub4x PWrkT3YE/MeN/2b3ICna18psfRwHIFG+GGg06zWOFPAfqHL6w5zFMfSDNX+PYHMmzZqd ZeQLBFqrzmfA724nEyrnzhcXTdULon3Jb1SNNCAAeU2XjAiK5EtCR2FmWVZ46X+acsja AnOstJ8Wn+jCjEtrXYnFWvHA+K24VBhgmmg0KlnpdmgSjJ09YfSPQOqSZP4BtnC/O0Cv zUsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ScBp9XTf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t188-20020a6378c5000000b0051b7f451cc6si18571997pgc.539.2023.05.16.13.04.21; Tue, 16 May 2023 13:04:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ScBp9XTf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229522AbjEPTrm (ORCPT + 99 others); Tue, 16 May 2023 15:47:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbjEPTrk (ORCPT ); Tue, 16 May 2023 15:47:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F05751BE6 for ; Tue, 16 May 2023 12:47:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8480163DB9 for ; Tue, 16 May 2023 19:47:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82409C433D2; Tue, 16 May 2023 19:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684266445; bh=WJ7zJ8wKo3Z+xOwBRYH0RqKqN+ywQ2CmZE2kNKIwXgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScBp9XTf1mm/fEQERYAAs/zBoK/nbDJ0uqqFSmni2XihRGPIdvbwY3lfhG/YoV7Wk J5ctZDxpFI4vdvE84yROlQOdZt++NmUbf0ePCEcq3gAf4W0ER+QCu1TjjKdJMg8zwy XzcERynrFL0aWUV/od/4XdAGFFJAP1P/a3abFTGixVQcJ33obSRvsNIjuk5Dh9YzUq XlqokYWCIuxrYW2FM0CBvyrojG4GVxKaasDcH4rVYv3DL3b4MDus35EXkiWnSsy/9o GadEdoq7H/lLC2q01zg2HgZH0AXVtKEimojnWjMKwIvD36ya3ynPySjY3QcVIeXoGG XJY5mD3O5V5rQ== From: Arnd Bergmann To: netdev@vger.kernel.org, Andrew Lunn , Heiner Kallweit Cc: Arnd Bergmann , Russell King , "David S. Miller" , Jakub Kicinski , Oleksij Rempel , Paolo Abeni , Maxime Chevallier , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] mdio_bus: unhide mdio_bus_init prototype Date: Tue, 16 May 2023 21:45:36 +0200 Message-Id: <20230516194625.549249-4-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516194625.549249-1-arnd@kernel.org> References: <20230516194625.549249-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766082462434804520?= X-GMAIL-MSGID: =?utf-8?q?1766082462434804520?= From: Arnd Bergmann mdio_bus_init() is either used as a local module_init() entry, or it gets called in phy_device.c. In the former case, there is no declaration, which causes a warning: drivers/net/phy/mdio_bus.c:1371:12: error: no previous prototype for 'mdio_bus_init' [-Werror=missing-prototypes] Remove the #ifdef around the declaration to avoid the warning.. Signed-off-by: Arnd Bergmann --- include/linux/phy.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/phy.h b/include/linux/phy.h index c5a0dc829714..6478838405a0 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1900,10 +1900,8 @@ void phy_package_leave(struct phy_device *phydev); int devm_phy_package_join(struct device *dev, struct phy_device *phydev, int addr, size_t priv_size); -#if IS_ENABLED(CONFIG_PHYLIB) int __init mdio_bus_init(void); void mdio_bus_exit(void); -#endif int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data); int phy_ethtool_get_sset_count(struct phy_device *phydev);