isdn: kcapi: don't build unused procfs code
authorArnd Bergmann <arnd@arndb.de>
Wed, 3 Apr 2024 08:06:44 +0000 (10:06 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sat, 6 Apr 2024 05:11:28 +0000 (22:11 -0700)
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>
Link: https://lore.kernel.org/r/20240403080702.3509288-27-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/isdn/capi/Makefile
drivers/isdn/capi/kcapi.c

index 352217ebabd8afd54549643de328fd5978c110c5..4fd3a4d7133f5a457e0763846b65660be87cb4d6 100644 (file)
@@ -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
index 136ba9fe55e0808c508d3e5d0f69edb58fe48a1f..c5d13bdc239be9a34488c3fdd1287a5bd2042429 100644 (file)
@@ -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);