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

ASoC: soc-pcm: merge dpcm_run_new/old_update() into dpcm_fe_runtime_update() 



soc-pcm has dpcm_run_new/old_update(), but these are used from
dpcm_fe_runtime_update() only, and are very verbose functions.
This patch disassembles these.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87blpvjc9v.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-pcm.c

+7 −28
Original line number Diff line number Diff line
@@ -2536,37 +2536,12 @@ disconnect: 
	return ret;

}



static int dpcm_run_new_update(struct snd_soc_pcm_runtime *fe, int stream)

{

	int ret;



	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_BE);

	ret = dpcm_run_update_startup(fe, stream);

	if (ret < 0)

		dev_err(fe->dev, "ASoC: failed to startup some BEs\n");

	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);



	return ret;

}



static int dpcm_run_old_update(struct snd_soc_pcm_runtime *fe, int stream)

{

	int ret;



	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_BE);

	ret = dpcm_run_update_shutdown(fe, stream);

	if (ret < 0)

		dev_err(fe->dev, "ASoC: failed to shutdown some BEs\n");

	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);



	return ret;

}



static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)

{

	struct snd_soc_dapm_widget_list *list;

	int stream;

	int count, paths;

	int ret;



	if (!fe->dai_link->dynamic)

		return 0;
@@ -2603,10 +2578,14 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new) 
		/* update any playback/capture paths */

		count = dpcm_process_paths(fe, stream, &list, new);

		if (count) {

			dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_BE);

			if (new)

				dpcm_run_new_update(fe, stream);

				ret = dpcm_run_update_startup(fe, stream);

			else

				dpcm_run_old_update(fe, stream);

				ret = dpcm_run_update_shutdown(fe, stream);

			if (ret < 0)

				dev_err(fe->dev, "ASoC: failed to shutdown some BEs\n");

			dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);



			dpcm_clear_pending_state(fe, stream);

			dpcm_be_disconnect(fe, stream);

CRA Git | Maintained and supported by SUSTech CRA and CCSE