From 3818069720cc76f35a419a9f2e694a079ed23f72 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 29 Jul 2019 10:07:52 +0200 Subject: can: mcp25xxfd: fix building without CONFIG_DEBUG_FS Signed-off-by: Marc Kleine-Budde (cherry picked from commit 5a142c75c22d38f7166e2e3ac8b08b3f834b61bc) --- drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c | 2 ++ drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h | 3 ++- drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h | 5 +++-- drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_rx.c | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'drivers') diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c index 527c551f514d..5a58fa5985bc 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can.c @@ -482,8 +482,10 @@ static int mcp25xxfd_can_open(struct net_device *net) return ret; } +#ifdef CONFIG_DEBUG_FS /* clear those statistics */ memset(&cpriv->stats, 0, sizeof(cpriv->stats)); +#endif /* request an IRQ but keep disabled for now */ ret = request_threaded_irq(spi->irq, NULL, diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h index 7c6a255c9400..922713075ef1 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_debugfs.h @@ -8,10 +8,11 @@ #ifndef __MCP25XXFD_CAN_DEBUGFS_H #define __MCP25XXFD_CAN_DEBUGFS_H +#include "mcp25xxfd_can_priv.h" + #ifdef CONFIG_DEBUG_FS #include -#include "mcp25xxfd_can_priv.h" #define MCP25XXFD_DEBUGFS_INCR(counter) ((counter)++) #define MCP25XXFD_DEBUGFS_ADD(counter, val) ((counter) += (val)) diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h index eeb9c88c7e97..ba585d5d2a25 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_priv.h @@ -132,6 +132,9 @@ struct mcp25xxfd_can_priv { } fifos; /* statistics exposed via debugfs */ +#define MCP25XXFD_CAN_TEF_READ_BINS 8 +#define MCP25XXFD_CAN_RX_BULK_READ_BINS 8 + #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dir; @@ -159,7 +162,6 @@ struct mcp25xxfd_can_priv { u64 tef_read_splits; u64 tef_conservative_reads; u64 tef_optimized_reads; -#define MCP25XXFD_CAN_TEF_READ_BINS 8 u64 tef_optimized_read_sizes[MCP25XXFD_CAN_TEF_READ_BINS]; u64 rx_reads; @@ -169,7 +171,6 @@ struct mcp25xxfd_can_priv { u64 rx_reads_prefetched_too_many_bytes; u64 rx_single_reads; u64 rx_bulk_reads; -#define MCP25XXFD_CAN_RX_BULK_READ_BINS 8 u64 rx_bulk_read_sizes[MCP25XXFD_CAN_RX_BULK_READ_BINS]; } stats; #endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_rx.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_rx.c index 8f9c0162ec57..a9e0da434e29 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_rx.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_rx.c @@ -98,7 +98,7 @@ int mcp25xxfd_can_rx_submit_frame(struct mcp25xxfd_can_priv *cpriv, int fifo) /* update stats */ net->stats.rx_packets++; net->stats.rx_bytes += len; - cpriv->fifos.rx.dlc_usage[dlc]++; + MCP25XXFD_DEBUGFS_INCR(cpriv->fifos.rx.dlc_usage[dlc]); if (rx->flags & MCP25XXFD_CAN_OBJ_FLAGS_FDF) MCP25XXFD_DEBUGFS_INCR(cpriv->fifos.rx.fd_count); @@ -151,7 +151,7 @@ static int mcp25xxfd_can_rx_read_frame(struct mcp25xxfd_can_priv *cpriv, /* we read the header plus prefetch_bytes */ if (read) { - cpriv->stats.rx_single_reads++; + MCP25XXFD_DEBUGFS_INCR(cpriv->stats.rx_single_reads); ret = mcp25xxfd_cmd_readn(spi, MCP25XXFD_SRAM_ADDR(addr), rx, sizeof(*rx) + prefetch_bytes); if (ret) @@ -187,7 +187,7 @@ static int mcp25xxfd_can_rx_read_frame(struct mcp25xxfd_can_priv *cpriv, } /* update stats */ - cpriv->stats.rx_reads++; + MCP25XXFD_DEBUGFS_INCR(cpriv->stats.rx_reads); if (len < prefetch_bytes) { MCP25XXFD_DEBUGFS_STATS_INCR(cpriv, rx_reads_prefetched_too_many); -- cgit v1.2.3