netdev - [PATCH] isdn/capi: hide unused procfs helpers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 13 Jul 2018 12:11:14 +0800
From:   YueHaibing <yuehaibing@...wei.com>
To:     <isdn@...ux-pingi.de>
CC:     <linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>,
        <keescook@...omium.org>, <viro@...iv.linux.org.uk>,
        YueHaibing <yuehaibing@...wei.com>
Subject: [PATCH] isdn/capi: hide unused procfs helpers

When CONFIG_PROC_FS isn't set, gcc warning this:

drivers/isdn/capi/capi.c:1324:12: warning: ‘capi20_proc_show’ defined but not used [-Wunused-function]
 static int capi20_proc_show(struct seq_file *m, void *v)
            ^
drivers/isdn/capi/capi.c:1347:12: warning: ‘capi20ncci_proc_show’ defined but not used [-Wunused-function]
 static int capi20ncci_proc_show(struct seq_file *m, void *v)
            ^
drivers/isdn/capi/capidrv.c:2454:12: warning: ‘capidrv_proc_show’ defined but not used [-Wunused-function]
 static int capidrv_proc_show(struct seq_file *m, void *v)
            ^

We can fix the warning by adding the same #ifdef around them.

Signed-off-by: YueHaibing <yuehaibing@...wei.com>
---
 drivers/isdn/capi/capi.c    | 2 ++
 drivers/isdn/capi/capidrv.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 6e0c281..594f767 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1317,6 +1317,7 @@ static inline void capinc_tty_exit(void) { }
 
 /* -------- /proc functions ----------------------------------------- */
 
+#ifdef CONFIG_PROC_FS
 /*
  * /proc/capi/capi20:
  *  minor applid nrecvctlpkt nrecvdatapkt nsendctlpkt nsenddatapkt
@@ -1359,6 +1360,7 @@ static int capi20ncci_proc_show(struct seq_file *m, void *v)
 	mutex_unlock(&capidev_list_lock);
 	return 0;
 }
+#endif
 
 static void __init proc_init(void)
 {
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index ee510f9..c6f45d7 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -2447,6 +2447,7 @@ lower_callback(struct notifier_block *nb, unsigned long val, void *v)
 	return NOTIFY_OK;
 }
 
+#ifdef CONFIG_PROC_FS
 /*
  * /proc/capi/capidrv:
  * nrecvctlpkt nrecvdatapkt nsendctlpkt nsenddatapkt
@@ -2460,6 +2461,7 @@ static int capidrv_proc_show(struct seq_file *m, void *v)
 		   global.ap.nsentdatapkt);
 	return 0;
 }
+#endif
 
 static void __init proc_init(void)
 {
-- 
2.7.0