Commit 92aff5b4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by David S. Miller
Browse files

dpaa2: no need to check return value of debugfs_create functions 



When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Because we don't care about the individual files, we can remove the
stored dentry for the files, as they are not needed to be kept track of
at all.

Cc: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d72ab11

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c

+7 −47
Original line number Diff line number Diff line
@@ -164,70 +164,30 @@ static const struct file_operations dpaa2_dbg_ch_ops = { 


void dpaa2_dbg_add(struct dpaa2_eth_priv *priv)

{

	if (!dpaa2_dbg_root)

		return;

	struct dentry *dir;



	/* Create a directory for the interface */

	priv->dbg.dir = debugfs_create_dir(priv->net_dev->name,

					   dpaa2_dbg_root);

	if (!priv->dbg.dir) {

		netdev_err(priv->net_dev, "debugfs_create_dir() failed\n");

		return;

	}

	dir = debugfs_create_dir(priv->net_dev->name, dpaa2_dbg_root);

	priv->dbg.dir = dir;



	/* per-cpu stats file */

	priv->dbg.cpu_stats = debugfs_create_file("cpu_stats", 0444,

						  priv->dbg.dir, priv,

						  &dpaa2_dbg_cpu_ops);

	if (!priv->dbg.cpu_stats) {

		netdev_err(priv->net_dev, "debugfs_create_file() failed\n");

		goto err_cpu_stats;

	}

	debugfs_create_file("cpu_stats", 0444, dir, priv, &dpaa2_dbg_cpu_ops);



	/* per-fq stats file */

	priv->dbg.fq_stats = debugfs_create_file("fq_stats", 0444,

						 priv->dbg.dir, priv,

						 &dpaa2_dbg_fq_ops);

	if (!priv->dbg.fq_stats) {

		netdev_err(priv->net_dev, "debugfs_create_file() failed\n");

		goto err_fq_stats;

	}

	debugfs_create_file("fq_stats", 0444, dir, priv, &dpaa2_dbg_fq_ops);



	/* per-fq stats file */

	priv->dbg.ch_stats = debugfs_create_file("ch_stats", 0444,

						 priv->dbg.dir, priv,

						 &dpaa2_dbg_ch_ops);

	if (!priv->dbg.fq_stats) {

		netdev_err(priv->net_dev, "debugfs_create_file() failed\n");

		goto err_ch_stats;

	}



	return;



err_ch_stats:

	debugfs_remove(priv->dbg.fq_stats);

err_fq_stats:

	debugfs_remove(priv->dbg.cpu_stats);

err_cpu_stats:

	debugfs_remove(priv->dbg.dir);

	debugfs_create_file("ch_stats", 0444, dir, priv, &dpaa2_dbg_ch_ops);

}



void dpaa2_dbg_remove(struct dpaa2_eth_priv *priv)

{

	debugfs_remove(priv->dbg.fq_stats);

	debugfs_remove(priv->dbg.ch_stats);

	debugfs_remove(priv->dbg.cpu_stats);

	debugfs_remove(priv->dbg.dir);

	debugfs_remove_recursive(priv->dbg.dir);

}



void dpaa2_eth_dbg_init(void)

{

	dpaa2_dbg_root = debugfs_create_dir(DPAA2_ETH_DBG_ROOT, NULL);

	if (!dpaa2_dbg_root) {

		pr_err("DPAA2-ETH: debugfs create failed\n");

		return;

	}



	pr_debug("DPAA2-ETH: debugfs created\n");

}

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h

+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ struct dpaa2_eth_priv; 


struct dpaa2_debugfs {

	struct dentry *dir;

	struct dentry *fq_stats;

	struct dentry *ch_stats;

	struct dentry *cpu_stats;

};



#ifdef CONFIG_DEBUG_FS

CRA Git | Maintained and supported by SUSTech CRA and CCSE