[PATCH] isdn/capi: hide unused procfs helpers

[PATCH] isdn/capi: hide unused procfs helpers

[YueHaibing]

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@huawei.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

Re: [PATCH] isdn/capi: hide unused procfs helpers

[YueHaibing]

pls ignore this,there has a fix from Randy.

On 2018/7/13 12:11, YueHaibing wrote:
> 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@huawei.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)
>  {
>