Unverified Commit 6d9b4dbf authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: merge soc_compr_open() rollback and soc_compr_free()" from... 

Merge series "ASoC: merge soc_compr_open() rollback and soc_compr_free()" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Hi Mark

soc_compr_open() does rollback when failed (A),
but, it is almost same as soc_compr_free().

	static int soc_compr_open(xxx)
	{
		...
		if (ret < 0)
			goto xxx_err;
		...
		return 0;

 ^	machine_err:
 |		...
 |	out:
(A)		...
 |	pm_err:
 |		...
 v		return ret;
	}

This kind of duplicated code can be a hotbed of bugs,
thus, this patch-set share soc_compr_free() and rollback.

Kuninori Morimoto (5):
  ASoC: soc-compress: move soc_compr_free() next to soc_compr_open()
  ASoC: soc-dai: add mark for snd_soc_dai_compr_startup/shutdown()
  ASoC: soc-component: add mark for snd_soc_component_compr_open/free()
  ASoC: soc-component: add mark for snd_soc_link_compr_startup/shutdown()
  ASoC: soc-compress: add soc_compr_clean() and call it from soc_compr_open/free()

 include/sound/soc-component.h |   6 +-
 include/sound/soc-dai.h       |   4 +-
 include/sound/soc-link.h      |   3 +-
 include/sound/soc.h           |   1 +
 sound/soc/soc-component.c     |  17 +++--
 sound/soc/soc-compress.c      | 115 +++++++++++++++++-----------------
 sound/soc/soc-dai.c           |  13 +++-
 sound/soc/soc-link.c          |  11 +++-
 8 files changed, 95 insertions(+), 75 deletions(-)

--
2.25.1
parents 0858fc17 453d32c2

include/sound/soc-component.h

+3 −3
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ struct snd_soc_component { 
	struct snd_pcm_substream *mark_module;

	struct snd_pcm_substream *mark_open;

	struct snd_pcm_substream *mark_hw_params;

	struct snd_compr_stream  *mark_compr_open;

	void *mark_pm;



#ifdef CONFIG_DEBUG_FS
@@ -444,10 +445,9 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component, 
int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,

					struct of_phandle_args *args,

					const char **dai_name);

int snd_soc_component_compr_open(struct snd_compr_stream *cstream,

				 struct snd_soc_component **last);

int snd_soc_component_compr_open(struct snd_compr_stream *cstream);

void snd_soc_component_compr_free(struct snd_compr_stream *cstream,

				  struct snd_soc_component *last);

				  int rollback);

int snd_soc_component_compr_trigger(struct snd_compr_stream *cstream, int cmd);

int snd_soc_component_compr_set_params(struct snd_compr_stream *cstream,

				       struct snd_compr_params *params);

include/sound/soc-dai.h

+3 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream, 
int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream);

void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,

				struct snd_compr_stream *cstream);

				struct snd_compr_stream *cstream,

				int rollback);

int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream, int cmd);

int snd_soc_dai_compr_set_params(struct snd_soc_dai *dai,
@@ -400,6 +401,7 @@ struct snd_soc_dai { 
	/* function mark */

	struct snd_pcm_substream *mark_startup;

	struct snd_pcm_substream *mark_hw_params;

	struct snd_compr_stream  *mark_compr_startup;



	/* bit field */

	unsigned int probed:1;

include/sound/soc-link.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ void snd_soc_link_hw_free(struct snd_pcm_substream *substream, 
int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd);



int snd_soc_link_compr_startup(struct snd_compr_stream *cstream);

void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream);

void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream,

				 int rollback);

int snd_soc_link_compr_set_params(struct snd_compr_stream *cstream);



#endif /* __SOC_LINK_H */

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,7 @@ struct snd_soc_pcm_runtime { 
	/* function mark */

	struct snd_pcm_substream *mark_startup;

	struct snd_pcm_substream *mark_hw_params;

	struct snd_compr_stream  *mark_compr_startup;



	/* bit field */

	unsigned int pop_wait:1;

sound/soc/soc-component.c

+8 −9
Original line number Diff line number Diff line
@@ -421,8 +421,7 @@ EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap); 


#endif



int snd_soc_component_compr_open(struct snd_compr_stream *cstream,

				 struct snd_soc_component **last)

int snd_soc_component_compr_open(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;
@@ -432,32 +431,32 @@ int snd_soc_component_compr_open(struct snd_compr_stream *cstream, 
		if (component->driver->compress_ops &&

		    component->driver->compress_ops->open) {

			ret = component->driver->compress_ops->open(component, cstream);

			if (ret < 0) {

				*last = component;

			if (ret < 0)

				return soc_component_ret(component, ret);

		}

		}

		soc_component_mark_push(component, cstream, compr_open);

	}



	*last = NULL;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_open);



void snd_soc_component_compr_free(struct snd_compr_stream *cstream,

				  struct snd_soc_component *last)

				  int rollback)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i;



	for_each_rtd_components(rtd, i, component) {

		if (component == last)

			break;

		if (rollback && !soc_component_mark_match(component, cstream, compr_open))

			continue;



		if (component->driver->compress_ops &&

		    component->driver->compress_ops->free)

			component->driver->compress_ops->free(component, cstream);



		soc_component_mark_pop(component, cstream, compr_open);

	}

}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_free);

CRA Git | Maintained and supported by SUSTech CRA and CCSE