Unverified Commit dd03907b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm: call snd_soc_component_open/close() once 



Current soc_pcm_open() calls snd_soc_component_open() under loop.
Thus, it needs to care about opened/not-yet-opened Component.

But, if soc-component.c is handling it, soc-pcm.c don't need to care
about it.
This patch adds opened flag to soc-component.h, and simplify soc-pcm.c.
This is one of prepare for cleanup soc-pcm-open()

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/874kvzcey1.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -147,8 +147,6 @@ struct snd_soc_component { 




	unsigned int active;

	unsigned int active;





	unsigned int suspended:1; /* is in suspend PM state */



	struct list_head list;

	struct list_head list;

	struct list_head card_aux_list; /* for auxiliary bound components */

	struct list_head card_aux_list; /* for auxiliary bound components */

	struct list_head card_list;

	struct list_head card_list;
@@ -182,6 +180,11 @@ struct snd_soc_component { 
	struct dentry *debugfs_root;

	struct dentry *debugfs_root;

	const char *debugfs_prefix;

	const char *debugfs_prefix;

#endif

#endif



	/* bit field */

	unsigned int suspended:1; /* is in suspend PM state */

	unsigned int opened:1;

	unsigned int module:1;

};

};





#define for_each_component_dais(component, dai)\

#define for_each_component_dais(component, dai)\

sound/soc/soc-component.c

+28 −7
Original line number Original line Diff line number Diff line
@@ -297,34 +297,55 @@ EXPORT_SYMBOL_GPL(snd_soc_component_set_jack); 
int snd_soc_component_module_get(struct snd_soc_component *component,

int snd_soc_component_module_get(struct snd_soc_component *component,

				 int upon_open)

				 int upon_open)

{

{

	if (component->module)

		return 0;



	if (component->driver->module_get_upon_open == !!upon_open &&

	if (component->driver->module_get_upon_open == !!upon_open &&

	    !try_module_get(component->dev->driver->owner))

	    !try_module_get(component->dev->driver->owner))

		return -ENODEV;

		return -ENODEV;





	component->module = 1;



	return 0;

	return 0;

}

}





void snd_soc_component_module_put(struct snd_soc_component *component,

void snd_soc_component_module_put(struct snd_soc_component *component,

				  int upon_open)

				  int upon_open)

{

{

	if (component->driver->module_get_upon_open == !!upon_open)

	if (component->module &&

	    component->driver->module_get_upon_open == !!upon_open)

		module_put(component->dev->driver->owner);

		module_put(component->dev->driver->owner);



	component->module = 0;

}

}





int snd_soc_component_open(struct snd_soc_component *component,

int snd_soc_component_open(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream)

			   struct snd_pcm_substream *substream)

{

{

	if (component->driver->open)

	int ret = 0;

		return component->driver->open(component, substream);



	return 0;

	if (!component->opened &&

	    component->driver->open)

		ret = component->driver->open(component, substream);



	if (ret == 0)

		component->opened = 1;



	return ret;

}

}





int snd_soc_component_close(struct snd_soc_component *component,

int snd_soc_component_close(struct snd_soc_component *component,

			    struct snd_pcm_substream *substream)

			    struct snd_pcm_substream *substream)

{

{

	if (component->driver->close)

	int ret = 0;

		return component->driver->close(component, substream);



	return 0;

	if (component->opened &&

	    component->driver->close)

		ret = component->driver->close(component, substream);



	component->opened = 0;



	return ret;

}

}





int snd_soc_component_prepare(struct snd_soc_component *component,

int snd_soc_component_prepare(struct snd_soc_component *component,

sound/soc/soc-pcm.c

+6 −13
Original line number Original line Diff line number Diff line
@@ -463,16 +463,13 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
	hw->rate_max = min_not_zero(hw->rate_max, rate_max);

	hw->rate_max = min_not_zero(hw->rate_max, rate_max);

}

}





static int soc_pcm_components_open(struct snd_pcm_substream *substream,

static int soc_pcm_components_open(struct snd_pcm_substream *substream)

				   struct snd_soc_component **last)

{

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_component *component;

	int i, ret = 0;

	int i, ret = 0;





	for_each_rtd_components(rtd, i, component) {

	for_each_rtd_components(rtd, i, component) {

		*last = component;



		ret = snd_soc_component_module_get_when_open(component);

		ret = snd_soc_component_module_get_when_open(component);

		if (ret < 0) {

		if (ret < 0) {

			dev_err(component->dev,

			dev_err(component->dev,
@@ -489,21 +486,17 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream, 
			return ret;

			return ret;

		}

		}

	}

	}

	*last = NULL;



	return 0;

	return 0;

}

}





static int soc_pcm_components_close(struct snd_pcm_substream *substream,

static int soc_pcm_components_close(struct snd_pcm_substream *substream)

				    struct snd_soc_component *last)

{

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_component *component;

	int i, r, ret = 0;

	int i, r, ret = 0;





	for_each_rtd_components(rtd, i, component) {

	for_each_rtd_components(rtd, i, component) {

		if (component == last)

			break;



		r = snd_soc_component_close(component, substream);

		r = snd_soc_component_close(component, substream);

		if (r < 0)

		if (r < 0)

			ret = r; /* use last ret */

			ret = r; /* use last ret */
@@ -545,7 +538,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
		goto out;

		goto out;

	}

	}





	ret = soc_pcm_components_open(substream, &component);

	ret = soc_pcm_components_open(substream);

	if (ret < 0)

	if (ret < 0)

		goto component_err;

		goto component_err;
@@ -642,7 +635,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
		snd_soc_dai_shutdown(codec_dai, substream);

		snd_soc_dai_shutdown(codec_dai, substream);





component_err:

component_err:

	soc_pcm_components_close(substream, component);

	soc_pcm_components_close(substream);





	snd_soc_dai_shutdown(cpu_dai, substream);

	snd_soc_dai_shutdown(cpu_dai, substream);

out:

out:
@@ -696,7 +689,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) 




	soc_rtd_shutdown(rtd, substream);

	soc_rtd_shutdown(rtd, substream);





	soc_pcm_components_close(substream, NULL);

	soc_pcm_components_close(substream);





	snd_soc_dapm_stream_stop(rtd, substream->stream);

	snd_soc_dapm_stream_stop(rtd, substream->stream);