diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-08-02 10:45:03 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:38:57 +0100 |
| commit | cde8d3b224fedabaa4fe9b2e646e529ba4dec9c0 (patch) | |
| tree | a3cfa8cb60fb19d335d5e4ec9fa4f9277ed68db0 | |
| parent | 3bae7960cb25a0215b585995b3e34c3ec3344f98 (diff) | |
can: mcp25xxfd: only build DEBUG_FS code if enabled
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
(cherry picked from commit d8a864d5eab58cfb0e4deb137359f80a828dc050)
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.c | 4 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile index 85c2985e14e7..3b20b50aedd0 100644 --- a/drivers/net/can/spi/mcp25xxfd/Makefile +++ b/drivers/net/can/spi/mcp25xxfd/Makefile @@ -4,7 +4,6 @@ obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o mcp25xxfd-objs := mcp25xxfd_base.o mcp25xxfd-objs += mcp25xxfd_can.o -mcp25xxfd-objs += mcp25xxfd_can_debugfs.o mcp25xxfd-objs += mcp25xxfd_can_fifo.o mcp25xxfd-objs += mcp25xxfd_can_int.o mcp25xxfd-objs += mcp25xxfd_can_rx.o @@ -12,7 +11,9 @@ mcp25xxfd-objs += mcp25xxfd_can_tx.o mcp25xxfd-objs += mcp25xxfd_clock.o mcp25xxfd-objs += mcp25xxfd_cmd.o mcp25xxfd-objs += mcp25xxfd_crc.o -mcp25xxfd-objs += mcp25xxfd_debugfs.o mcp25xxfd-objs += mcp25xxfd_ecc.o mcp25xxfd-objs += mcp25xxfd_gpio.o mcp25xxfd-objs += mcp25xxfd_int.o + +mcp25xxfd-$(CONFIG_DEBUG_FS) += mcp25xxfd_can_debugfs.o +mcp25xxfd-$(CONFIG_DEBUG_FS) += mcp25xxfd_debugfs.o diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.c index 013a1a30963a..a7be645a2fd9 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.c @@ -5,8 +5,6 @@ * Copyright 2019 Martin Sperl <kernel@martin.sperl.org> */ -#ifdef CONFIG_DEBUG_FS - #include <linux/dcache.h> #include <linux/debugfs.h> #include "mcp25xxfd_can_debugfs.h" @@ -232,5 +230,3 @@ void mcp25xxfd_can_debugfs_setup(struct mcp25xxfd_can_priv *cpriv) mcp25xxfd_can_debugfs_tx_fifos(cpriv, root); mcp25xxfd_can_debugfs_tx_queue(cpriv, root); } - -#endif diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.c index 303bcba27919..20969c76db46 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.c @@ -5,8 +5,6 @@ * Copyright 2019 Martin Sperl <kernel@martin.sperl.org> */ -#ifdef CONFIG_DEBUG_FS - #include <linux/debugfs.h> #include <linux/kernel.h> #include <linux/seq_file.h> @@ -112,5 +110,3 @@ void mcp25xxfd_debugfs_remove(struct mcp25xxfd_priv *priv) debugfs_remove_recursive(priv->debugfs_dir); priv->debugfs_dir = NULL; } - -#endif /* CONFIG_DEBUG_FS */ |