Unverified Commit 227ab8ba authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Mark Brown
Browse files

ASoC: fsl: 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.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7f807f28

sound/soc/fsl/fsl_ssi.c

+1 −3
Original line number Diff line number Diff line
@@ -1582,9 +1582,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
		}

	}



	ret = fsl_ssi_debugfs_create(&ssi->dbg_stats, dev);

	if (ret)

		goto error_asoc_register;

	fsl_ssi_debugfs_create(&ssi->dbg_stats, dev);



	/* Initially configures SSI registers */

	fsl_ssi_hw_init(ssi);

sound/soc/fsl/fsl_ssi.h

+3 −5
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ struct device; 


struct fsl_ssi_dbg {

	struct dentry *dbg_dir;

	struct dentry *dbg_stats;



	struct {

		unsigned int rfrc;
@@ -299,7 +298,7 @@ struct fsl_ssi_dbg { 


void fsl_ssi_dbg_isr(struct fsl_ssi_dbg *ssi_dbg, u32 sisr);



int fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg, struct device *dev);

void fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg, struct device *dev);



void fsl_ssi_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg);
@@ -312,10 +311,9 @@ static inline void fsl_ssi_dbg_isr(struct fsl_ssi_dbg *stats, u32 sisr) 
{

}



static inline int fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg,

static inline void fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg,

					  struct device *dev)

{

	return 0;

}



static inline void fsl_ssi_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)

sound/soc/fsl/fsl_ssi_dbg.c

+4 −14
Original line number Diff line number Diff line
@@ -126,25 +126,15 @@ static int fsl_ssi_stats_show(struct seq_file *s, void *unused) 


DEFINE_SHOW_ATTRIBUTE(fsl_ssi_stats);



int fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg, struct device *dev)

void fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg, struct device *dev)

{

	ssi_dbg->dbg_dir = debugfs_create_dir(dev_name(dev), NULL);

	if (!ssi_dbg->dbg_dir)

		return -ENOMEM;



	ssi_dbg->dbg_stats = debugfs_create_file("stats", 0444,

						 ssi_dbg->dbg_dir, ssi_dbg,

	debugfs_create_file("stats", 0444, ssi_dbg->dbg_dir, ssi_dbg,

			    &fsl_ssi_stats_fops);

	if (!ssi_dbg->dbg_stats) {

		debugfs_remove(ssi_dbg->dbg_dir);

		return -ENOMEM;

	}



	return 0;

}



void fsl_ssi_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)

{

	debugfs_remove(ssi_dbg->dbg_stats);

	debugfs_remove(ssi_dbg->dbg_dir);

	debugfs_remove_recursive(ssi_dbg->dbg_dir);

}

sound/soc/fsl/imx-audmux.c

+2 −8
Original line number Diff line number Diff line
@@ -141,17 +141,11 @@ static void audmux_debugfs_init(void) 
	char buf[20];



	audmux_debugfs_root = debugfs_create_dir("audmux", NULL);

	if (!audmux_debugfs_root) {

		pr_warning("Failed to create AUDMUX debugfs root\n");

		return;

	}



	for (i = 0; i < MX31_AUDMUX_PORT7_SSI_PINS_7 + 1; i++) {

		snprintf(buf, sizeof(buf), "ssi%lu", i);

		if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,

					 (void *)i, &audmux_debugfs_fops))

			pr_warning("Failed to create AUDMUX port %lu debugfs file\n",

				   i);

		debugfs_create_file(buf, 0444, audmux_debugfs_root,

				    (void *)i, &audmux_debugfs_fops);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE