Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50fb4f74 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: remove STMMAC_DEBUG_FS 



the STMMAC_DEBUG_FS Koption is now removed from the
driver configuration and this support will be built
by default when DEBUG_FS is present. This can also be
useful on building driver verification.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0d54066

drivers/net/ethernet/stmicro/stmmac/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -38,14 +38,6 @@ config STMMAC_PCI 


	  If unsure, say N.



config STMMAC_DEBUG_FS

	bool "Enable monitoring via sysFS "

	default n

	depends on STMMAC_ETH && DEBUG_FS

	---help---

	  The stmmac entry in /sys reports DMA TX/RX rings

	  or (if supported) the HW cap register.



config STMMAC_DA

	bool "STMMAC DMA arbitration scheme"

	default n

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+7 −7
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ 
#include <linux/slab.h>

#include <linux/prefetch.h>

#include <linux/pinctrl/consumer.h>

#ifdef CONFIG_STMMAC_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#endif /* CONFIG_STMMAC_DEBUG_FS */

#endif /* CONFIG_DEBUG_FS */

#include <linux/net_tstamp.h>

#include "stmmac_ptp.h"

#include "stmmac.h"
@@ -116,7 +116,7 @@ MODULE_PARM_DESC(chain_mode, "To use chain instead of ring mode"); 


static irqreturn_t stmmac_interrupt(int irq, void *dev_id);



#ifdef CONFIG_STMMAC_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

static int stmmac_init_fs(struct net_device *dev);

static void stmmac_exit_fs(void);

#endif
@@ -1688,7 +1688,7 @@ static int stmmac_hw_setup(struct net_device *dev) 
	if (ret && ret != -EOPNOTSUPP)

		pr_warn("%s: failed PTP initialisation\n", __func__);



#ifdef CONFIG_STMMAC_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

	ret = stmmac_init_fs(dev);

	if (ret < 0)

		pr_warn("%s: failed debugFS registration\n", __func__);
@@ -1866,7 +1866,7 @@ static int stmmac_release(struct net_device *dev) 


	netif_carrier_off(dev);



#ifdef CONFIG_STMMAC_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

	stmmac_exit_fs();

#endif
@@ -2453,7 +2453,7 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
	return ret;

}



#ifdef CONFIG_STMMAC_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

static struct dentry *stmmac_fs_dir;

static struct dentry *stmmac_rings_status;

static struct dentry *stmmac_dma_cap;
@@ -2638,7 +2638,7 @@ static void stmmac_exit_fs(void) 
	debugfs_remove(stmmac_dma_cap);

	debugfs_remove(stmmac_fs_dir);

}

#endif /* CONFIG_STMMAC_DEBUG_FS */

#endif /* CONFIG_DEBUG_FS */



static const struct net_device_ops stmmac_netdev_ops = {

	.ndo_open = stmmac_open,