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

ASoC: codecs: use snd_soc_xxx_active() 



We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87wo5e58j4.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/adav80x.c

+2 −2
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static int adav80x_dai_startup(struct snd_pcm_substream *substream, 
	struct snd_soc_component *component = dai->component;

	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);



	if (!snd_soc_component_is_active(component) || !adav80x->rate)

	if (!snd_soc_component_active(component) || !adav80x->rate)

		return 0;



	return snd_pcm_hw_constraint_single(substream->runtime,
@@ -738,7 +738,7 @@ static void adav80x_dai_shutdown(struct snd_pcm_substream *substream, 
	struct snd_soc_component *component = dai->component;

	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);



	if (!snd_soc_component_is_active(component))

	if (!snd_soc_component_active(component))

		adav80x->rate = 0;

}

sound/soc/codecs/arizona.c

+1 −1
Original line number Diff line number Diff line
@@ -1926,7 +1926,7 @@ static int arizona_dai_set_sysclk(struct snd_soc_dai *dai, 
	if (clk_id == dai_priv->clk)

		return 0;



	if (dai->active) {

	if (snd_soc_dai_active(dai)) {

		dev_err(component->dev, "Can't change clock on active DAI %d\n",

			dai->id);

		return -EBUSY;

sound/soc/codecs/cs4271.c

+2 −2
Original line number Diff line number Diff line
@@ -356,9 +356,9 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream, 
		 */



		if ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

		     !dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]) ||

		     !snd_soc_dai_stream_active(dai, SNDRV_PCM_STREAM_CAPTURE)) ||

		    (substream->stream == SNDRV_PCM_STREAM_CAPTURE &&

		     !dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK])) {

		     !snd_soc_dai_stream_active(dai, SNDRV_PCM_STREAM_PLAYBACK))) {

			ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,

						 CS4271_MODE2_PDN,

						 CS4271_MODE2_PDN);

sound/soc/codecs/madera.c

+1 −1
Original line number Diff line number Diff line
@@ -3279,7 +3279,7 @@ static int madera_dai_set_sysclk(struct snd_soc_dai *dai, 
	if (is_sync == madera_is_syncclk(dai_priv->clk))

		return 0;



	if (dai->active) {

	if (snd_soc_dai_active(dai)) {

		dev_err(component->dev, "Can't change clock on active DAI %d\n",

			dai->id);

		return -EBUSY;

sound/soc/codecs/max98090.c

+3 −3
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ static int max98090_dai_trigger(struct snd_pcm_substream *substream, int cmd, 
	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		if (!max98090->master && dai->active == 1)

		if (!max98090->master && snd_soc_dai_active(dai) == 1)

			queue_delayed_work(system_power_efficient_wq,

					   &max98090->pll_det_enable_work,

					   msecs_to_jiffies(10));
@@ -2047,7 +2047,7 @@ static int max98090_dai_trigger(struct snd_pcm_substream *substream, int cmd, 
	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		if (!max98090->master && dai->active == 1)

		if (!max98090->master && snd_soc_dai_active(dai) == 1)

			schedule_work(&max98090->pll_det_disable_work);

		break;

	default:
@@ -2109,7 +2109,7 @@ static void max98090_pll_work(struct max98090_priv *max98090) 
	unsigned int pll;

	int i;



	if (!snd_soc_component_is_active(component))

	if (!snd_soc_component_active(component))

		return;



	dev_info_ratelimited(component->dev, "PLL unlocked\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE