From: Arnd Bergmann <arnd@kernel•org>
To: linux-kernel@vger•kernel.org
Cc: Arnd Bergmann <arnd@arndb•de>, Karsten Keil <isdn@linux-pingi•de>,
Kees Cook <keescook@chromium•org>,
Justin Stitt <justinstitt@google•com>,
netdev@vger•kernel.org
Subject: [PATCH 26/34] isdn: kcapi: don't build unused procfs code
Date: Wed, 3 Apr 2024 10:06:44 +0200 [thread overview]
Message-ID: <20240403080702.3509288-27-arnd@kernel.org> (raw)
In-Reply-To: <20240403080702.3509288-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb•de>
The procfs file is completely unused without CONFIG_PROC_FS but causes
a compile time warning:
drivers/isdn/capi/kcapi_proc.c:97:36: error: unused variable 'seq_controller_ops' [-Werror,-Wunused-const-variable]
static const struct seq_operations seq_controller_ops = {
drivers/isdn/capi/kcapi_proc.c:104:36: error: unused variable 'seq_contrstats_ops' [-Werror,-Wunused-const-variable]
drivers/isdn/capi/kcapi_proc.c:179:36: error: unused variable 'seq_applications_ops' [-Werror,-Wunused-const-variable]
drivers/isdn/capi/kcapi_proc.c:186:36: error: unused variable 'seq_applstats_ops' [-Werror,-Wunused-const-variable]
Remove the file from the build in that config and make the calls into
it conditional instead.
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
---
drivers/isdn/capi/Makefile | 3 ++-
drivers/isdn/capi/kcapi.c | 7 +++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/isdn/capi/Makefile b/drivers/isdn/capi/Makefile
index 352217ebabd8..4fd3a4d7133f 100644
--- a/drivers/isdn/capi/Makefile
+++ b/drivers/isdn/capi/Makefile
@@ -2,4 +2,5 @@
# Makefile for the CAPI subsystem used by BT_CMTP
obj-$(CONFIG_BT_CMTP) += kernelcapi.o
-kernelcapi-y := kcapi.o capiutil.o capi.o kcapi_proc.o
+kernelcapi-y := kcapi.o capiutil.o capi.o
+kernelcapi-$(CONFIG_PROC_FS) += kcapi_proc.o
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index 136ba9fe55e0..c5d13bdc239b 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -917,13 +917,16 @@ int __init kcapi_init(void)
return err;
}
- kcapi_proc_init();
+ if (IS_ENABLED(CONFIG_PROC_FS))
+ kcapi_proc_init();
+
return 0;
}
void kcapi_exit(void)
{
- kcapi_proc_exit();
+ if (IS_ENABLED(CONFIG_PROC_FS))
+ kcapi_proc_exit();
cdebug_exit();
destroy_workqueue(kcapi_wq);
--
2.39.2
next prev parent reply other threads:[~2024-04-03 8:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 8:06 [PATCH 00/34] address all -Wunused-const warnings Arnd Bergmann
2024-04-03 8:06 ` [PATCH 05/34] 3c515: remove unused 'mtu' variable Arnd Bergmann
2024-04-03 8:06 ` [PATCH 19/34] sunrpc: suppress warnings for unused procfs functions Arnd Bergmann
2024-04-03 8:59 ` Jeff Layton
2024-04-03 13:20 ` Chuck Lever
2024-04-03 8:06 ` Arnd Bergmann [this message]
2024-04-03 8:06 ` [PATCH 28/34] net: xgbe: remove extraneous #ifdef checks Arnd Bergmann
2024-04-03 8:06 ` [PATCH 33/34] drivers: remove incorrect of_match_ptr/ACPI_PTR annotations Arnd Bergmann
2024-04-03 9:13 ` Krzysztof Kozlowski
2024-04-03 9:30 ` Andy Shevchenko
2024-04-03 12:47 ` Corey Minyard
2024-04-03 13:23 ` Andy Shevchenko
2024-04-03 12:47 ` Corey Minyard
2024-04-03 16:09 ` Jarkko Sakkinen
2024-04-09 13:48 ` Greg Kroah-Hartman
2024-04-23 7:33 ` Xu Yilun
2024-04-23 9:52 ` Peter Rosin
2024-04-06 5:20 ` [PATCH 00/34] address all -Wunused-const warnings patchwork-bot+netdevbpf
2024-04-10 8:02 ` (subset) " Sebastian Reichel
2024-04-22 8:16 ` Michael Ellerman
2025-01-27 13:24 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240403080702.3509288-27-arnd@kernel.org \
--to=arnd@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=isdn@linux-pingi$(echo .)de \
--cc=justinstitt@google$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox