summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorAlexander Aring <aar@pengutronix.de>2016-05-23 15:13:00 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2016-06-17 15:39:41 +0200
commita20fadf85312f7e999c7279af3e038e4f3539fbf (patch)
treec5cfc361049f3cdd460e6c99353bcc206593c726 /net/can
parent3636876a5680f2816a99807cd997b142ed24fcdb (diff)
downloadlinux-a20fadf85312f7e999c7279af3e038e4f3539fbf.tar.gz
linux-a20fadf85312f7e999c7279af3e038e4f3539fbf.tar.bz2
linux-a20fadf85312f7e999c7279af3e038e4f3539fbf.zip
can: build proc support only if CONFIG_PROC_FS is activated
When building can subsystem with CONFIG_PROC_FS=n I detected some unused variables warning by using proc functions. In CAN the proc handling is nicely placed in one object file. This patch adds simple add a dependency on CONFIG_PROC_FS for CAN's proc.o file and corresponding static inline no-op functions. Signed-off-by: Alexander Aring <aar@pengutronix.de> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> [mkl: provide static inline noops instead of using #ifdefs] Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/Makefile3
-rw-r--r--net/can/af_can.h11
-rw-r--r--net/can/proc.c3
3 files changed, 14 insertions, 3 deletions
diff --git a/net/can/Makefile b/net/can/Makefile
index cef49eb1f5c7..10936754e3f2 100644
--- a/net/can/Makefile
+++ b/net/can/Makefile
@@ -3,7 +3,8 @@
#
obj-$(CONFIG_CAN) += can.o
-can-y := af_can.o proc.o
+can-y := af_can.o
+can-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_CAN_RAW) += can-raw.o
can-raw-y := raw.o
diff --git a/net/can/af_can.h b/net/can/af_can.h
index fca0fe9fc45a..38a79ff20022 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -113,8 +113,19 @@ struct s_pstats {
extern struct dev_rcv_lists can_rx_alldev_list;
/* function prototypes for the CAN networklayer procfs (proc.c) */
+#ifdef CONFIG_PROC_FS
void can_init_proc(void);
void can_remove_proc(void);
+#else
+static inline void can_init_proc(void)
+{
+ pr_info("can: Can't create /proc/net/can. CONFIG_PROC_FS missing!\n");
+}
+
+static inline void can_remove_proc(void)
+{
+}
+#endif
void can_stat_update(unsigned long data);
/* structures and variables from af_can.c needed in proc.c for reading */
diff --git a/net/can/proc.c b/net/can/proc.c
index 1a19b985a868..85ef7bb0f176 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -517,8 +517,7 @@ void can_init_proc(void)
can_dir = proc_mkdir("can", init_net.proc_net);
if (!can_dir) {
- printk(KERN_INFO "can: failed to create /proc/net/can . "
- "CONFIG_PROC_FS missing?\n");
+ pr_info("can: failed to create /proc/net/can.\n");
return;
}