can: mcp25xxfd: make debugfs support a separate option

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
(cherry picked from commit 6cf806f542afb974470f29324fcfa76539539c8b)

7 files changed, 26 insertions, 16 deletions

diff --git a/drivers/net/can/spi/mcp25xxfd/Kconfig b/drivers/net/can/spi/mcp25xxfd/Kconfig
index 47b61e9a25d1..1d2bd95febfe 100644
--- a/drivers/net/can/spi/mcp25xxfd/Kconfig
+++ b/drivers/net/can/spi/mcp25xxfd/Kconfig
@@ -1,7 +1,17 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-config CAN_MCP25XXFD
+menuconfig CAN_MCP25XXFD
 	tristate "Microchip MCP25xxFD SPI CAN controllers"
 	depends on HAS_DMA
 	help
 	  Driver for the Microchip MCP25XXFD SPI FD-CAN controller family.
+
+if CAN_MCP25XXFD
+
+config CAN_MCP25XXFD_DEBUG_FS
+	bool "Enable debugfs for MCP25xxFD SPI driver"
+	depends on DEBUG_FS
+	help
+	  Choose Y to enable RX/TX and FIFO statistics.
+
+endif
diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile
index 3b20b50aedd0..76a7596ddd4b 100644
--- a/drivers/net/can/spi/mcp25xxfd/Makefile
+++ b/drivers/net/can/spi/mcp25xxfd/Makefile
@@ -15,5 +15,5 @@ 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
+mcp25xxfd-$(CONFIG_CAN_MCP25XXFD_DEBUG_FS) += mcp25xxfd_can_debugfs.o
+mcp25xxfd-$(CONFIG_CAN_MCP25XXFD_DEBUG_FS) += mcp25xxfd_debugfs.o
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c
index 5a58fa5985bc..91de7ac3ec73 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c
@@ -482,7 +482,7 @@ static int mcp25xxfd_can_open(struct net_device *net)
 		return ret;
 	}
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 	/* clear those statistics */
 	memset(&cpriv->stats, 0, sizeof(cpriv->stats));
 #endif
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h
index 922713075ef1..a8391370d4bf 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h
@@ -10,7 +10,7 @@
 
 #include "mcp25xxfd_can_priv.h"
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 
 #include <linux/debugfs.h>
 
@@ -24,7 +24,7 @@
 void mcp25xxfd_can_debugfs_setup(struct mcp25xxfd_can_priv *cpriv);
 void mcp25xxfd_can_debugfs_remove(struct mcp25xxfd_can_priv *cpriv);
 
-#else /* CONFIG_DEBUG_FS */
+#else /* CONFIG_CAN_MCP25XXFD_DEBUG_FS */
 
 #define MCP25XXFD_DEBUGFS_INCR(counter)
 #define MCP25XXFD_DEBUGFS_ADD(counter, val)
@@ -41,5 +41,5 @@ void mcp25xxfd_can_debugfs_remove(struct mcp25xxfd_can_priv *cpriv)
 {
 }
 
-#endif /* CONFIG_DEBUG_FS */
+#endif /* CONFIG_CAN_MCP25XXFD_DEBUG_FS */
 #endif /* __MCP25XXFD_CAN_DEBUGFS_H */
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h
index ba585d5d2a25..7bc1894dced8 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h
@@ -20,10 +20,10 @@ struct mcp25xxfd_fifo {
 	u32 count;
 	u32 start;
 	u32 size;
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 	u64 dlc_usage[16];
 	u64 fd_count;
-#endif /* CONFIG_DEBUG_FS */
+#endif /* CONFIG_CAN_MCP25XXFD_DEBUG_FS */
 };
 
 /* used for sorting incoming messages */
@@ -38,9 +38,9 @@ struct mcp25xxfd_fifo_info {
 	u32 is_rx;
 	u32 offset;
 	u32 priority;
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 	u64 use_count;
-#endif /* CONFIG_DEBUG_FS */
+#endif /* CONFIG_CAN_MCP25XXFD_DEBUG_FS */
 };
 
 struct mcp25xxfd_can_priv {
@@ -135,7 +135,7 @@ struct mcp25xxfd_can_priv {
 #define MCP25XXFD_CAN_TEF_READ_BINS 8
 #define MCP25XXFD_CAN_RX_BULK_READ_BINS 8
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 	struct dentry *debugfs_dir;
 
 	struct {
@@ -173,7 +173,7 @@ struct mcp25xxfd_can_priv {
 		u64 rx_bulk_reads;
 		u64 rx_bulk_read_sizes[MCP25XXFD_CAN_RX_BULK_READ_BINS];
 	} stats;
-#endif /* CONFIG_DEBUG_FS */
+#endif /* CONFIG_CAN_MCP25XXFD_DEBUG_FS */
 
 	/* history of rx-dlc */
 	struct {
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.h
index 7f54cecb3b9e..905f15ea7f5d 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.h
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_debugfs.h
@@ -10,7 +10,7 @@
 
 #include "mcp25xxfd_priv.h"
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 
 void mcp25xxfd_debugfs_setup(struct mcp25xxfd_priv *priv);
 void mcp25xxfd_debugfs_remove(struct mcp25xxfd_priv *priv);
@@ -25,5 +25,5 @@ static inline void mcp25xxfd_debugfs_remove(struct mcp25xxfd_priv *priv)
 {
 }
 
-#endif /* CONFIG_DEBUG_FS */
+#endif /* CONFIG_CAN_MCP25XXFD_DEBUG_FS */
 #endif /* __MCP25XXFD_DEBUGFS_H */
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_priv.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_priv.h
index 28ff3e35e0b6..63bfb13af95a 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_priv.h
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_priv.h
@@ -78,7 +78,7 @@ struct mcp25xxfd_priv {
 	} regs;
 
 	/* debugfs related */
-#if defined(CONFIG_DEBUG_FS)
+#ifdef CONFIG_CAN_MCP25XXFD_DEBUG_FS
 	struct dentry *debugfs_dir;
 	struct dentry *debugfs_regs_dir;
 	struct {