ASoC: qcom: sdm845: use for_each_rtd_codec_dai() macro (a4eb41ee) · Commits · 戴 / test

sound/soc/qcom/sdm845.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -43,14 +43,14 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai_link *dai_link = rtd->dai_link;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai *codec_dai;
		u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
		u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
		int ret = 0, i;

		for (i = 0 ; i < dai_link->num_codecs; i++) {
		ret = snd_soc_dai_get_channel_map(rtd->codec_dais[i],
		for_each_rtd_codec_dai(rtd, i, codec_dai) {
		ret = snd_soc_dai_get_channel_map(codec_dai,
		&tx_ch_cnt, tx_ch, &rx_ch_cnt, rx_ch);

		if (ret != 0 && ret != -ENOTSUPP) {
		@@ -77,6 +77,7 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream,
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai *codec_dai;
		int ret = 0, j;
		int channels, slot_width;

		@@ -125,8 +126,7 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream,
		}
		}

		for (j = 0; j < rtd->num_codecs; j++) {
		struct snd_soc_dai *codec_dai = rtd->codec_dais[j];
		for_each_rtd_codec_dai(rtd, j, codec_dai) {

		if (!strcmp(codec_dai->component->name_prefix, "Left")) {
		ret = snd_soc_dai_set_tdm_slot(
		@@ -214,7 +214,6 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd)
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(card);
		struct snd_jack *jack;
		struct snd_soc_dai_link *dai_link = rtd->dai_link;
		/*
		* Codec SLIMBUS configuration
		* RX1, RX2, RX3, RX4, RX5, RX6, RX7, RX8, RX9, RX10, RX11, RX12, RX13
		@@ -266,8 +265,8 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd)
		}
		break;
		case SLIMBUS_0_RX...SLIMBUS_6_TX:
		for (i = 0 ; i < dai_link->num_codecs; i++) {
		rval = snd_soc_dai_set_channel_map(rtd->codec_dais[i],
		for_each_rtd_codec_dai(rtd, i, codec_dai) {
		rval = snd_soc_dai_set_channel_map(codec_dai,
		ARRAY_SIZE(tx_ch),
		tx_ch,
		ARRAY_SIZE(rx_ch),
		@@ -275,7 +274,7 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd)
		if (rval != 0 && rval != -ENOTSUPP)
		return rval;

		snd_soc_dai_set_sysclk(rtd->codec_dais[i], 0,
		snd_soc_dai_set_sysclk(codec_dai, 0,
		WCD934X_DEFAULT_MCLK_RATE,
		SNDRV_PCM_STREAM_PLAYBACK);
		}
		@@ -345,8 +344,7 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream)

		codec_dai_fmt \|= SND_SOC_DAIFMT_IB_NF \| SND_SOC_DAIFMT_DSP_B;

		for (j = 0; j < rtd->num_codecs; j++) {
		codec_dai = rtd->codec_dais[j];
		for_each_rtd_codec_dai(rtd, j, codec_dai) {

		if (!strcmp(codec_dai->component->name_prefix,
		"Left")) {

Admin message