Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: rename for_each_rtd_codec_dai_reverse to rollback 



commit 0b7990e3 ("ASoC: add for_each_rtd_codec_dai() macro")
added for_each_rtd_codec_dai_reverse(). but _rollback() is better
naming than _reverse(). This patch rename it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7afecb30

include/sound/soc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1164,7 +1164,7 @@ struct snd_soc_pcm_runtime { 
	for ((i) = 0;						       \

	for ((i) = 0;						       \

	     ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \

	     ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \

	     (i)++)

	     (i)++)

#define for_each_rtd_codec_dai_reverse(rtd, i, dai)				\

#define for_each_rtd_codec_dai_rollback(rtd, i, dai)		\

	for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);)

	for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);)

sound/soc/soc-pcm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -621,7 +621,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
	i = rtd->num_codecs;

	i = rtd->num_codecs;





codec_dai_err:

codec_dai_err:

	for_each_rtd_codec_dai_reverse(rtd, i, codec_dai) {

	for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) {

		if (codec_dai->driver->ops->shutdown)

		if (codec_dai->driver->ops->shutdown)

			codec_dai->driver->ops->shutdown(substream, codec_dai);

			codec_dai->driver->ops->shutdown(substream, codec_dai);

	}

	}
@@ -1015,7 +1015,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
	i = rtd->num_codecs;

	i = rtd->num_codecs;





codec_err:

codec_err:

	for_each_rtd_codec_dai_reverse(rtd, i, codec_dai) {

	for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) {

		if (codec_dai->driver->ops->hw_free)

		if (codec_dai->driver->ops->hw_free)

			codec_dai->driver->ops->hw_free(substream, codec_dai);

			codec_dai->driver->ops->hw_free(substream, codec_dai);

		codec_dai->rate = 0;

		codec_dai->rate = 0;