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

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

Also, there is no need to store the individual debugfs file name, just
remove the whole directory all at once, saving a local variable.

Note, the soc-pcm "state" file has now moved to a subdirectory, as it is
only a good idea to save the dentries for debugfs directories, not
individual files, as the individual file debugfs functions are changing
to not return a dentry.

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20190731131716.9764-2-gregkh@linuxfoundation.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d8701fae

include/sound/soc.h

+0 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,6 @@ struct snd_soc_card { 


#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_card_root;

	struct dentry *debugfs_pop_time;

#endif

	u32 pop_time;

sound/soc/soc-core.c

+6 −37
Original line number Diff line number Diff line
@@ -165,13 +165,6 @@ static void soc_init_component_debugfs(struct snd_soc_component *component) 
				component->card->debugfs_card_root);

	}



	if (IS_ERR(component->debugfs_root)) {

		dev_warn(component->dev,

			"ASoC: Failed to create component debugfs directory: %ld\n",

			PTR_ERR(component->debugfs_root));

		return;

	}



	snd_soc_dapm_debugfs_init(snd_soc_component_get_dapm(component),

		component->debugfs_root);

}
@@ -215,32 +208,15 @@ DEFINE_SHOW_ATTRIBUTE(component_list); 


static void soc_init_card_debugfs(struct snd_soc_card *card)

{

	if (!snd_soc_debugfs_root)

		return;



	card->debugfs_card_root = debugfs_create_dir(card->name,

						     snd_soc_debugfs_root);

	if (IS_ERR(card->debugfs_card_root)) {

		dev_warn(card->dev,

			 "ASoC: Failed to create card debugfs directory: %ld\n",

			 PTR_ERR(card->debugfs_card_root));

		card->debugfs_card_root = NULL;

		return;

	}



	card->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,

						    card->debugfs_card_root,

	debugfs_create_u32("dapm_pop_time", 0644, card->debugfs_card_root,

			   &card->pop_time);

	if (IS_ERR(card->debugfs_pop_time))

		dev_warn(card->dev,

			 "ASoC: Failed to create pop time debugfs file: %ld\n",

			 PTR_ERR(card->debugfs_pop_time));

}



static void soc_cleanup_card_debugfs(struct snd_soc_card *card)

{

	if (!card->debugfs_card_root)

		return;

	debugfs_remove_recursive(card->debugfs_card_root);

	card->debugfs_card_root = NULL;

}
@@ -248,19 +224,12 @@ static void soc_cleanup_card_debugfs(struct snd_soc_card *card) 
static void snd_soc_debugfs_init(void)

{

	snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL);

	if (IS_ERR_OR_NULL(snd_soc_debugfs_root)) {

		pr_warn("ASoC: Failed to create debugfs directory\n");

		snd_soc_debugfs_root = NULL;

		return;

	}



	if (!debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL,

				 &dai_list_fops))

		pr_warn("ASoC: Failed to create DAI list debugfs file\n");

	debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL,

			    &dai_list_fops);



	if (!debugfs_create_file("components", 0444, snd_soc_debugfs_root, NULL,

				 &component_list_fops))

		pr_warn("ASoC: Failed to create component list debugfs file\n");

	debugfs_create_file("components", 0444, snd_soc_debugfs_root, NULL,

			    &component_list_fops);

}



static void snd_soc_debugfs_exit(void)

sound/soc/soc-dapm.c

+4 −26
Original line number Diff line number Diff line
@@ -2154,50 +2154,28 @@ static const struct file_operations dapm_bias_fops = { 
void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,

	struct dentry *parent)

{

	struct dentry *d;



	if (!parent || IS_ERR(parent))

		return;



	dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);



	if (IS_ERR(dapm->debugfs_dapm)) {

		dev_warn(dapm->dev,

			 "ASoC: Failed to create DAPM debugfs directory %ld\n",

			 PTR_ERR(dapm->debugfs_dapm));

		return;

	}



	d = debugfs_create_file("bias_level", 0444,

				dapm->debugfs_dapm, dapm,

	debugfs_create_file("bias_level", 0444, dapm->debugfs_dapm, dapm,

			    &dapm_bias_fops);

	if (IS_ERR(d))

		dev_warn(dapm->dev,

			 "ASoC: Failed to create bias level debugfs file: %ld\n",

			 PTR_ERR(d));

}



static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_dapm_context *dapm = w->dapm;

	struct dentry *d;



	if (!dapm->debugfs_dapm || !w->name)

		return;



	d = debugfs_create_file(w->name, 0444,

				dapm->debugfs_dapm, w,

	debugfs_create_file(w->name, 0444, dapm->debugfs_dapm, w,

			    &dapm_widget_power_fops);

	if (IS_ERR(d))

		dev_warn(w->dapm->dev,

			 "ASoC: Failed to create %s debugfs file: %ld\n",

			 w->name, PTR_ERR(d));

}



static void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)

{

	if (!dapm->debugfs_dapm)

		return;

	debugfs_remove_recursive(dapm->debugfs_dapm);

	dapm->debugfs_dapm = NULL;

}

sound/soc/soc-pcm.c

+4 −10
Original line number Diff line number Diff line
@@ -1205,9 +1205,9 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, 
			stream ? "<-" : "->", be->dai_link->name);



#ifdef CONFIG_DEBUG_FS

	if (fe->debugfs_dpcm_root)

		dpcm->debugfs_state = debugfs_create_u32(be->dai_link->name, 0644,

				fe->debugfs_dpcm_root, &dpcm->state);

	dpcm->debugfs_state = debugfs_create_dir(be->dai_link->name,

						 fe->debugfs_dpcm_root);

	debugfs_create_u32("state", 0644, dpcm->debugfs_state, &dpcm->state);

#endif

	return 1;

}
@@ -1262,7 +1262,7 @@ void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream) 
		dpcm_be_reparent(fe, dpcm->be, stream);



#ifdef CONFIG_DEBUG_FS

		debugfs_remove(dpcm->debugfs_state);

		debugfs_remove_recursive(dpcm->debugfs_state);

#endif

		spin_lock_irqsave(&fe->card->dpcm_lock, flags);

		list_del(&dpcm->list_be);
@@ -3415,12 +3415,6 @@ void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) 


	rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name,

			rtd->card->debugfs_card_root);

	if (!rtd->debugfs_dpcm_root) {

		dev_dbg(rtd->dev,

			 "ASoC: Failed to create dpcm debugfs directory %s\n",

			 rtd->dai_link->name);

		return;

	}



	debugfs_create_file("state", 0444, rtd->debugfs_dpcm_root,

			    rtd, &dpcm_state_fops);

CRA Git | Maintained and supported by SUSTech CRA and CCSE