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

Commit 9f923c3e authored by Banajit Goswami's avatar Banajit Goswami Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: update DAI link's be_id to id 



Update all MSM audio drivers with Backend Dai-link's "be_id"
field with "id".
These changes are in accordance with the upstream changes
in ASoC between Linux-4.4 and Linux-4.9 versions.

Change-Id: Ibacb8908ec96668a2db9fc6a02d34b2947395999
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent d068499d

sound/soc/msm/msm8996.c

+63 −63
Original line number Diff line number Diff line
@@ -2071,11 +2071,11 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream, 
				__func__, ret);

			goto end;

		}

		if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_5_RX) {

		if (dai_link->id == MSM_BACKEND_DAI_SLIMBUS_5_RX) {

			pr_debug("%s: rx_5_ch=%d\n", __func__,

				  msm_slim_5_rx_ch);

			rx_ch_count = msm_slim_5_rx_ch;

		} else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_6_RX) {

		} else if (dai_link->id == MSM_BACKEND_DAI_SLIMBUS_6_RX) {

			pr_debug("%s: rx_6_ch=%d\n", __func__,

				  msm_slim_6_rx_ch);

			rx_ch_count = msm_slim_6_rx_ch;
@@ -2103,25 +2103,25 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream, 
			goto end;

		}

		/* For <codec>_tx1 case */

		if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_0_TX)

		if (dai_link->id == MSM_BACKEND_DAI_SLIMBUS_0_TX)

			user_set_tx_ch = msm_slim_0_tx_ch;

		/* For <codec>_tx3 case */

		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_1_TX)

		else if (dai_link->id == MSM_BACKEND_DAI_SLIMBUS_1_TX)

			user_set_tx_ch = msm_slim_1_tx_ch;

		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_3_TX)

		else if (dai_link->id == MSM_BACKEND_DAI_SLIMBUS_3_TX)

			/* DAI 5 is used for external EC reference from codec.

			 * Since Rx is fed as reference for EC, the config of

			 * this DAI is based on that of the Rx path.

			 */

			user_set_tx_ch = msm_slim_0_rx_ch;

		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX)

		else if (dai_link->id == MSM_BACKEND_DAI_SLIMBUS_4_TX)

			user_set_tx_ch = msm_vi_feed_tx_ch;

		else

			user_set_tx_ch = tx_ch_cnt;



		pr_debug("%s: msm_slim_0_tx_ch(%d) user_set_tx_ch(%d) tx_ch_cnt(%d), be_id (%d)\n",

		pr_debug("%s: msm_slim_0_tx_ch(%d) user_set_tx_ch(%d) tx_ch_cnt(%d), BE id (%d)\n",

			 __func__, msm_slim_0_tx_ch, user_set_tx_ch,

			 tx_ch_cnt, dai_link->be_id);

			 tx_ch_cnt, dai_link->id);



		ret = snd_soc_dai_set_channel_map(cpu_dai,

						  user_set_tx_ch, tx_ch, 0, 0);
@@ -2167,8 +2167,8 @@ static int msm_snd_cpe_hw_params(struct snd_pcm_substream *substream, 


	user_set_tx_ch = tx_ch_cnt;



	pr_debug("%s: tx_ch_cnt(%d) be_id %d\n",

		 __func__, tx_ch_cnt, dai_link->be_id);

	pr_debug("%s: tx_ch_cnt(%d) BE id %d\n",

		 __func__, tx_ch_cnt, dai_link->id);



	ret = snd_soc_dai_set_channel_map(cpu_dai,

					  user_set_tx_ch, tx_ch, 0, 0);
@@ -2289,7 +2289,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA1

		.id = MSM_FRONTEND_DAI_MULTIMEDIA1

	},

	{

		.name = "MSM8996 Media2",
@@ -2306,7 +2306,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA2,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA2,

	},

	{

		.name = "VoiceMMode1",
@@ -2323,7 +2323,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_VOICEMMODE1,

		.id = MSM_FRONTEND_DAI_VOICEMMODE1,

	},

	{

		.name = "MSM VoIP",
@@ -2340,7 +2340,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_VOIP,

		.id = MSM_FRONTEND_DAI_VOIP,

	},

	{

		.name = "MSM8996 ULL",
@@ -2358,7 +2358,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA3,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA3,

	},

	/* Hostless PCM purpose */

	{
@@ -2428,7 +2428,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA4,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA4,

	},

	{

		.name = "AUXPCM Hostless",
@@ -2514,7 +2514,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_VOLTE,

		.id = MSM_FRONTEND_DAI_VOLTE,

	},

	{

		.name = "MSM8996 LowLatency",
@@ -2532,7 +2532,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA5,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA5,

		.ops = &msm8996_mm5_ops,

	},

	{
@@ -2549,7 +2549,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM1,

		.id = MSM_FRONTEND_DAI_LSM1,

	},

	/* Multiple Tunnel instances */

	{
@@ -2566,7 +2566,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA7,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA7,

	},

	{

		.name = "MSM8996 Compress3",
@@ -2582,7 +2582,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA10,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA10,

	},

	{

		.name = "MSM8996 ULL NOIRQ",
@@ -2599,7 +2599,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA8,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA8,

	},

	{

		.name = "QCHAT",
@@ -2617,7 +2617,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_QCHAT,

		.id = MSM_FRONTEND_DAI_QCHAT,

	},

	/* HDMI Hostless */

	{
@@ -2650,7 +2650,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_VOICEMMODE2,

		.id = MSM_FRONTEND_DAI_VOICEMMODE2,

	},

	{

		.name = "INT_HFP_BT Hostless",
@@ -2685,7 +2685,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA6,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA6,

	},

	/* LSM FE */

	{
@@ -2702,7 +2702,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM2,

		.id = MSM_FRONTEND_DAI_LSM2,

	},

	{

		.name = "Listen 3 Audio Service",
@@ -2718,7 +2718,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM3,

		.id = MSM_FRONTEND_DAI_LSM3,

	},

	{

		.name = "Listen 4 Audio Service",
@@ -2734,7 +2734,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM4,

		.id = MSM_FRONTEND_DAI_LSM4,

	},

	{

		.name = "Listen 5 Audio Service",
@@ -2750,7 +2750,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM5,

		.id = MSM_FRONTEND_DAI_LSM5,

	},

	{

		.name = "Listen 6 Audio Service",
@@ -2766,7 +2766,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM6,

		.id = MSM_FRONTEND_DAI_LSM6,

	},

	{

		.name = "Listen 7 Audio Service",
@@ -2782,7 +2782,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM7,

		.id = MSM_FRONTEND_DAI_LSM7,

	},

	{

		.name = "Listen 8 Audio Service",
@@ -2798,7 +2798,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM8,

		.id = MSM_FRONTEND_DAI_LSM8,

	},

	{

		.name = "MSM8996 Media9",
@@ -2815,7 +2815,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA9,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA9,

	},

	{

		.name = "VoWLAN",
@@ -2832,7 +2832,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_VOWLAN,

		.id = MSM_FRONTEND_DAI_VOWLAN,

	},

	{

		.name = "MSM8996 Compress4",
@@ -2848,7 +2848,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA11,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA11,

	},

	{

		.name = "MSM8996 Compress5",
@@ -2864,7 +2864,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA12,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA12,

	},

	{

		.name = "MSM8996 Compress6",
@@ -2880,7 +2880,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA13,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA13,

	},

	{

		.name = "MSM8996 Compress7",
@@ -2896,7 +2896,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA14,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA14,

	},

	{

		.name = "MSM8996 Compress8",
@@ -2912,7 +2912,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA15,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA15,

	},

	{

		.name = "MSM8996 Compress9",
@@ -2928,7 +2928,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA16,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA16,

	},

	{

		.name = "Circuit-Switch Voice",
@@ -2946,7 +2946,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_CS_VOICE,

		.id = MSM_FRONTEND_DAI_CS_VOICE,

	},

	{

		.name = "Voice2",
@@ -2964,7 +2964,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_VOICE2,

		.id = MSM_FRONTEND_DAI_VOICE2,

	},

};
@@ -2976,7 +2976,7 @@ static struct snd_soc_dai_link msm8996_tasha_fe_dai_links[] = { 
		.platform_name = "msm-pcm-hostless",

		.codec_name = "tasha_codec",

		.codec_dai_name = "tasha_vifeedback",

		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,

		.id = MSM_BACKEND_DAI_SLIMBUS_4_TX,

		.be_hw_params_fixup = msm_slim_4_tx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
@@ -3065,7 +3065,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_AFE_PCM_RX,

		.id = MSM_BACKEND_DAI_AFE_PCM_RX,

		.be_hw_params_fixup = msm_proxy_rx_be_hw_params_fixup,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,
@@ -3080,7 +3080,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_AFE_PCM_TX,

		.id = MSM_BACKEND_DAI_AFE_PCM_TX,

		.be_hw_params_fixup = msm_proxy_tx_be_hw_params_fixup,

		.ignore_suspend = 1,

	},
@@ -3094,7 +3094,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_AUXPCM_RX,

		.id = MSM_BACKEND_DAI_AUXPCM_RX,

		.be_hw_params_fixup = msm_auxpcm_be_params_fixup,

		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,
@@ -3109,7 +3109,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_AUXPCM_TX,

		.id = MSM_BACKEND_DAI_AUXPCM_TX,

		.be_hw_params_fixup = msm_auxpcm_be_params_fixup,

		.ignore_suspend = 1,

	},
@@ -3123,7 +3123,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_INCALL_RECORD_TX,

		.id = MSM_BACKEND_DAI_INCALL_RECORD_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},
@@ -3137,7 +3137,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_INCALL_RECORD_RX,

		.id = MSM_BACKEND_DAI_INCALL_RECORD_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},
@@ -3151,7 +3151,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

		.id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},
@@ -3165,7 +3165,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

		.id = MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},
@@ -3178,7 +3178,7 @@ static struct snd_soc_dai_link msm8996_common_be_dai_links[] = { 
		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

		.id = MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

		.be_hw_params_fixup = msm_tx_be_hw_params_fixup,

		.ops = &msm8996_mi2s_be_ops,

		.ignore_suspend = 1,
@@ -3196,7 +3196,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_mix_rx1",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_0_RX,

		.id = MSM_BACKEND_DAI_SLIMBUS_0_RX,

		.init = &msm_audrx_init,

		.be_hw_params_fixup = msm_slim_0_rx_be_hw_params_fixup,

		/* this dainlink has playback support */
@@ -3213,7 +3213,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_tx1",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_0_TX,

		.id = MSM_BACKEND_DAI_SLIMBUS_0_TX,

		.be_hw_params_fixup = msm_slim_0_tx_be_hw_params_fixup,

		.ignore_suspend = 1,

		.ops = &msm8996_be_ops,
@@ -3227,7 +3227,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_mix_rx1",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_1_RX,

		.id = MSM_BACKEND_DAI_SLIMBUS_1_RX,

		.be_hw_params_fixup = msm_slim_0_rx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		/* dai link has playback support */
@@ -3243,7 +3243,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_tx3",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_1_TX,

		.id = MSM_BACKEND_DAI_SLIMBUS_1_TX,

		.be_hw_params_fixup = msm_slim_1_tx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		.ignore_suspend = 1,
@@ -3257,7 +3257,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_mix_rx1",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_3_RX,

		.id = MSM_BACKEND_DAI_SLIMBUS_3_RX,

		.be_hw_params_fixup = msm_slim_0_rx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		/* dai link has playback support */
@@ -3273,7 +3273,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_tx1",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_3_TX,

		.id = MSM_BACKEND_DAI_SLIMBUS_3_TX,

		.be_hw_params_fixup = msm_slim_0_tx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		.ignore_suspend = 1,
@@ -3287,7 +3287,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_mix_rx1",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_RX,

		.id = MSM_BACKEND_DAI_SLIMBUS_4_RX,

		.be_hw_params_fixup = msm_slim_0_rx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		/* dai link has playback support */
@@ -3303,7 +3303,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_rx3",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_5_RX,

		.id = MSM_BACKEND_DAI_SLIMBUS_5_RX,

		.be_hw_params_fixup = msm_slim_5_rx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		/* dai link has playback support */
@@ -3320,7 +3320,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_mad1",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_5_TX,

		.id = MSM_BACKEND_DAI_SLIMBUS_5_TX,

		.be_hw_params_fixup = msm_slim_5_tx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		.ignore_suspend = 1,
@@ -3334,7 +3334,7 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = { 
		.codec_dai_name = "tasha_rx4",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_6_RX,

		.id = MSM_BACKEND_DAI_SLIMBUS_6_RX,

		.be_hw_params_fixup = msm_slim_6_rx_be_hw_params_fixup,

		.ops = &msm8996_be_ops,

		/* dai link has playback support */
@@ -3354,7 +3354,7 @@ static struct snd_soc_dai_link msm8996_hdmi_dai_link[] = { 
		.codec_dai_name = "msm_hdmi_audio_codec_rx_dai",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_HDMI_RX,

		.id = MSM_BACKEND_DAI_HDMI_RX,

		.be_hw_params_fixup = msm8996_hdmi_be_hw_params_fixup,

		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,

sound/soc/msm/msm8998.c

+108 −108

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c

+7 −7
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static int msm_compr_playback_prepare(struct snd_pcm_substream *substream) 
		return -ENOMEM;

	}

	msm_pcm_routing_reg_phy_stream(

			soc_prtd->dai_link->be_id,

			soc_prtd->dai_link->id,

			prtd->audio_client->perf_mode,

			prtd->session_id,

			substream->stream);
@@ -533,7 +533,7 @@ static int msm_compr_capture_prepare(struct snd_pcm_substream *substream) 
		}

		pr_debug("msm_pcm_routing_reg_phy_stream\n");

		msm_pcm_routing_reg_phy_stream(

				soc_prtd->dai_link->be_id,

				soc_prtd->dai_link->id,

				prtd->audio_client->perf_mode,

				prtd->session_id, substream->stream);

		break;
@@ -659,7 +659,7 @@ static int msm_compr_trigger(struct snd_pcm_substream *substream, int cmd) 
				break;

			default:

				msm_pcm_routing_reg_psthr_stream(

					soc_prtd->dai_link->be_id,

					soc_prtd->dai_link->id,

					prtd->session_id, substream->stream);

				break;

			}
@@ -680,7 +680,7 @@ static int msm_compr_trigger(struct snd_pcm_substream *substream, int cmd) 
				break;

			default:

				msm_pcm_routing_reg_psthr_stream(

					soc_prtd->dai_link->be_id,

					soc_prtd->dai_link->id,

					prtd->session_id, substream->stream);

				break;

			}
@@ -824,7 +824,7 @@ static int msm_compr_playback_close(struct snd_pcm_substream *substream) 
	q6asm_audio_client_buf_free_contiguous(dir,

				prtd->audio_client);

		msm_pcm_routing_dereg_phy_stream(

			soc_prtd->dai_link->be_id,

			soc_prtd->dai_link->id,

			SNDRV_PCM_STREAM_PLAYBACK);

	q6asm_audio_client_free(prtd->audio_client);

	kfree(prtd);
@@ -844,7 +844,7 @@ static int msm_compr_capture_close(struct snd_pcm_substream *substream) 
	q6asm_cmd(prtd->audio_client, CMD_CLOSE);

	q6asm_audio_client_buf_free_contiguous(dir,

				prtd->audio_client);

	msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->be_id,

	msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->id,

				SNDRV_PCM_STREAM_CAPTURE);

	q6asm_audio_client_free(prtd->audio_client);

	kfree(prtd);
@@ -1615,7 +1615,7 @@ static int msm_compr_add_controls(struct snd_soc_pcm_runtime *rtd) 


	dev_dbg(rtd->dev, "%s, Volume cntrl add\n", __func__);

	ret = snd_pcm_add_volume_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,

				      NULL, 1, rtd->dai_link->be_id,

				      NULL, 1, rtd->dai_link->id,

				      &volume_info);

	if (ret < 0)

		return ret;

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+46 −46
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ static int msm_compr_set_volume(struct snd_compr_stream *cstream, 
		return rc;

	}



	use_default = !(pdata->ch_map[rtd->dai_link->be_id]->set_ch_map);

	chmap = pdata->ch_map[rtd->dai_link->be_id]->channel_map;

	use_default = !(pdata->ch_map[rtd->dai_link->id]->set_ch_map);

	chmap = pdata->ch_map[rtd->dai_link->id]->channel_map;

	num_channels = prtd->num_channels;



	if (prtd->num_channels > 2) {
@@ -818,11 +818,11 @@ static int msm_compr_send_media_format_block(struct snd_compr_stream *cstream, 
	switch (prtd->codec) {

	case FORMAT_LINEAR_PCM:

		pr_debug("SND_AUDIOCODEC_PCM\n");

		if (pdata->ch_map[rtd->dai_link->be_id]) {

		if (pdata->ch_map[rtd->dai_link->id]) {

			use_default_chmap =

			    !(pdata->ch_map[rtd->dai_link->be_id]->set_ch_map);

			    !(pdata->ch_map[rtd->dai_link->id]->set_ch_map);

			chmap =

			    pdata->ch_map[rtd->dai_link->be_id]->channel_map;

			    pdata->ch_map[rtd->dai_link->id]->channel_map;

		}



		switch (prtd->codec_param.codec.format) {
@@ -1121,7 +1121,7 @@ static int msm_compr_configure_dsp_for_playback 
		prtd->gapless_state.stream_opened[stream_index] = 1;



		ret = msm_pcm_routing_reg_phy_compr_stream(

				soc_prtd->dai_link->be_id,

				soc_prtd->dai_link->id,

				ac->perf_mode,

				prtd->session_id,

				SNDRV_PCM_STREAM_PLAYBACK,
@@ -1145,8 +1145,8 @@ static int msm_compr_configure_dsp_for_playback 
		}

		prtd->gapless_state.stream_opened[stream_index] = 1;



		pr_debug("%s: be_id %d\n", __func__, soc_prtd->dai_link->be_id);

		ret = msm_pcm_routing_reg_phy_stream(soc_prtd->dai_link->be_id,

		pr_debug("%s: BE id %d\n", __func__, soc_prtd->dai_link->be_id);

		ret = msm_pcm_routing_reg_phy_stream(soc_prtd->dai_link->id,

				ac->perf_mode,

				prtd->session_id,

				SNDRV_PCM_STREAM_PLAYBACK);
@@ -1254,7 +1254,7 @@ static int msm_compr_configure_dsp_for_capture(struct snd_compr_stream *cstream) 
		return ret;

	}



	ret = msm_pcm_routing_reg_phy_stream(soc_prtd->dai_link->be_id,

	ret = msm_pcm_routing_reg_phy_stream(soc_prtd->dai_link->id,

			ac->perf_mode,

			prtd->session_id,

			SNDRV_PCM_STREAM_CAPTURE);
@@ -1331,22 +1331,22 @@ static int msm_compr_playback_open(struct snd_compr_stream *cstream) 


	runtime->private_data = NULL;

	prtd->cstream = cstream;

	pdata->cstream[rtd->dai_link->be_id] = cstream;

	pdata->audio_effects[rtd->dai_link->be_id] =

	pdata->cstream[rtd->dai_link->id] = cstream;

	pdata->audio_effects[rtd->dai_link->id] =

		 kzalloc(sizeof(struct msm_compr_audio_effects), GFP_KERNEL);

	if (!pdata->audio_effects[rtd->dai_link->be_id]) {

	if (!pdata->audio_effects[rtd->dai_link->id]) {

		pr_err("%s: Could not allocate memory for effects\n", __func__);

		pdata->cstream[rtd->dai_link->be_id] = NULL;

		pdata->cstream[rtd->dai_link->id] = NULL;

		kfree(prtd);

		return -ENOMEM;

	}

	pdata->dec_params[rtd->dai_link->be_id] =

	pdata->dec_params[rtd->dai_link->id] =

		 kzalloc(sizeof(struct msm_compr_dec_params), GFP_KERNEL);

	if (!pdata->dec_params[rtd->dai_link->be_id]) {

	if (!pdata->dec_params[rtd->dai_link->id]) {

		pr_err("%s: Could not allocate memory for dec params\n",

			__func__);

		kfree(pdata->audio_effects[rtd->dai_link->be_id]);

		pdata->cstream[rtd->dai_link->be_id] = NULL;

		kfree(pdata->audio_effects[rtd->dai_link->id]);

		pdata->cstream[rtd->dai_link->id] = NULL;

		kfree(prtd);

		return -ENOMEM;

	}
@@ -1392,9 +1392,9 @@ static int msm_compr_playback_open(struct snd_compr_stream *cstream) 
				(app_cb)compr_event_handler, prtd);

	if (!prtd->audio_client) {

		pr_err("%s: Could not allocate memory for client\n", __func__);

		kfree(pdata->audio_effects[rtd->dai_link->be_id]);

		kfree(pdata->dec_params[rtd->dai_link->be_id]);

		pdata->cstream[rtd->dai_link->be_id] = NULL;

		kfree(pdata->audio_effects[rtd->dai_link->id]);

		kfree(pdata->dec_params[rtd->dai_link->id]);

		pdata->cstream[rtd->dai_link->id] = NULL;

		runtime->private_data = NULL;

		kfree(prtd);

		return -ENOMEM;
@@ -1423,13 +1423,13 @@ static int msm_compr_capture_open(struct snd_compr_stream *cstream) 


	runtime->private_data = NULL;

	prtd->cstream = cstream;

	pdata->cstream[rtd->dai_link->be_id] = cstream;

	pdata->cstream[rtd->dai_link->id] = cstream;



	prtd->audio_client = q6asm_audio_client_alloc(

				(app_cb)compr_event_handler, prtd);

	if (!prtd->audio_client) {

		pr_err("%s: Could not allocate memory for client\n", __func__);

		pdata->cstream[rtd->dai_link->be_id] = NULL;

		pdata->cstream[rtd->dai_link->id] = NULL;

		kfree(prtd);

		return -ENOMEM;

	}
@@ -1548,9 +1548,9 @@ static int msm_compr_playback_free(struct snd_compr_stream *cstream) 
	}

	spin_unlock_irqrestore(&prtd->lock, flags);



	pdata->cstream[soc_prtd->dai_link->be_id] = NULL;

	pdata->cstream[soc_prtd->dai_link->id] = NULL;

	if (cstream->direction == SND_COMPRESS_PLAYBACK) {

		msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->be_id,

		msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->id,

						SNDRV_PCM_STREAM_PLAYBACK);

	}
@@ -1558,10 +1558,10 @@ static int msm_compr_playback_free(struct snd_compr_stream *cstream) 


	q6asm_audio_client_free(ac);



	kfree(pdata->audio_effects[soc_prtd->dai_link->be_id]);

	pdata->audio_effects[soc_prtd->dai_link->be_id] = NULL;

	kfree(pdata->dec_params[soc_prtd->dai_link->be_id]);

	pdata->dec_params[soc_prtd->dai_link->be_id] = NULL;

	kfree(pdata->audio_effects[soc_prtd->dai_link->id]);

	pdata->audio_effects[soc_prtd->dai_link->id] = NULL;

	kfree(pdata->dec_params[soc_prtd->dai_link->id]);

	pdata->dec_params[soc_prtd->dai_link->id] = NULL;

	kfree(prtd);



	return 0;
@@ -1613,8 +1613,8 @@ static int msm_compr_capture_free(struct snd_compr_stream *cstream) 
	}

	spin_unlock_irqrestore(&prtd->lock, flags);



	pdata->cstream[soc_prtd->dai_link->be_id] = NULL;

	msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->be_id,

	pdata->cstream[soc_prtd->dai_link->id] = NULL;

	msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->id,

					SNDRV_PCM_STREAM_CAPTURE);



	q6asm_audio_client_buf_free_contiguous(dir, ac);
@@ -1886,9 +1886,9 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct msm_compr_pdata *pdata =

			snd_soc_platform_get_drvdata(rtd->platform);

	uint32_t *volume = pdata->volume[rtd->dai_link->be_id];

	uint32_t *volume = pdata->volume[rtd->dai_link->id];

	struct audio_client *ac = prtd->audio_client;

	unsigned long fe_id = rtd->dai_link->be_id;

	unsigned long fe_id = rtd->dai_link->id;

	int rc = 0;

	int bytes_to_write;

	unsigned long flags;
@@ -3538,7 +3538,7 @@ static int msm_compr_add_volume_control(struct snd_soc_pcm_runtime *rtd) 
		return 0;

	}

	pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",

		 __func__, rtd->dai_link->name, rtd->dai_link->be_id,

		 __func__, rtd->dai_link->name, rtd->dai_link->id,

		 rtd->dai_link->cpu_dai_name, rtd->pcm->device);

	ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1 +

		  strlen(suffix) + 1;
@@ -3550,7 +3550,7 @@ static int msm_compr_add_volume_control(struct snd_soc_pcm_runtime *rtd) 
	snprintf(mixer_str, ctl_len, "%s %d %s", mixer_ctl_name,

		 rtd->pcm->device, suffix);

	fe_volume_control[0].name = mixer_str;

	fe_volume_control[0].private_value = rtd->dai_link->be_id;

	fe_volume_control[0].private_value = rtd->dai_link->id;

	pr_debug("Registering new mixer ctl %s", mixer_str);

	snd_soc_add_platform_controls(rtd->platform, fe_volume_control,

				      ARRAY_SIZE(fe_volume_control));
@@ -3583,7 +3583,7 @@ static int msm_compr_add_audio_effects_control(struct snd_soc_pcm_runtime *rtd) 
	}



	pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",

		 __func__, rtd->dai_link->name, rtd->dai_link->be_id,

		 __func__, rtd->dai_link->name, rtd->dai_link->id,

		 rtd->dai_link->cpu_dai_name, rtd->pcm->device);



	ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
@@ -3595,7 +3595,7 @@ static int msm_compr_add_audio_effects_control(struct snd_soc_pcm_runtime *rtd) 
	snprintf(mixer_str, ctl_len, "%s %d", mixer_ctl_name, rtd->pcm->device);



	fe_audio_effects_config_control[0].name = mixer_str;

	fe_audio_effects_config_control[0].private_value = rtd->dai_link->be_id;

	fe_audio_effects_config_control[0].private_value = rtd->dai_link->id;

	pr_debug("Registering new mixer ctl %s\n", mixer_str);

	snd_soc_add_platform_controls(rtd->platform,

				fe_audio_effects_config_control,
@@ -3627,7 +3627,7 @@ static int msm_compr_add_query_audio_effect_control( 
		return 0;

	}

	pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",

		 __func__, rtd->dai_link->name, rtd->dai_link->be_id,

		 __func__, rtd->dai_link->name, rtd->dai_link->id,

		 rtd->dai_link->cpu_dai_name, rtd->pcm->device);

	ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;

	mixer_str = kzalloc(ctl_len, GFP_KERNEL);
@@ -3637,7 +3637,7 @@ static int msm_compr_add_query_audio_effect_control( 
	}

	snprintf(mixer_str, ctl_len, "%s %d", mixer_ctl_name, rtd->pcm->device);

	fe_query_audio_effect_control[0].name = mixer_str;

	fe_query_audio_effect_control[0].private_value = rtd->dai_link->be_id;

	fe_query_audio_effect_control[0].private_value = rtd->dai_link->id;

	pr_debug("%s: registering new mixer ctl %s\n", __func__, mixer_str);

	snd_soc_add_platform_controls(rtd->platform,

				fe_query_audio_effect_control,
@@ -3672,7 +3672,7 @@ static int msm_compr_add_dec_runtime_params_control( 
	}



	pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",

		 __func__, rtd->dai_link->name, rtd->dai_link->be_id,

		 __func__, rtd->dai_link->name, rtd->dai_link->id,

		 rtd->dai_link->cpu_dai_name, rtd->pcm->device);



	ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1 +
@@ -3686,7 +3686,7 @@ static int msm_compr_add_dec_runtime_params_control( 
		 rtd->pcm->device, suffix);



	fe_dec_params_control[0].name = mixer_str;

	fe_dec_params_control[0].private_value = rtd->dai_link->be_id;

	fe_dec_params_control[0].private_value = rtd->dai_link->id;

	pr_debug("Registering new mixer ctl %s", mixer_str);

	snd_soc_add_platform_controls(rtd->platform,

				      fe_dec_params_control,
@@ -3721,7 +3721,7 @@ static int msm_compr_add_app_type_cfg_control(struct snd_soc_pcm_runtime *rtd) 
	}



	pr_debug("%s: added new compr FE ctl with name %s, id %d, cpu dai %s, device no %d\n",

		__func__, rtd->dai_link->name, rtd->dai_link->be_id,

		__func__, rtd->dai_link->name, rtd->dai_link->id,

			rtd->dai_link->cpu_dai_name, rtd->pcm->device);

	if (rtd->compr->direction == SND_COMPRESS_PLAYBACK)

		ctl_len = strlen(playback_mixer_ctl_name) + 1 + strlen(deviceNo)
@@ -3743,7 +3743,7 @@ static int msm_compr_add_app_type_cfg_control(struct snd_soc_pcm_runtime *rtd) 
			 capture_mixer_ctl_name, rtd->pcm->device, suffix);



	fe_app_type_cfg_control[0].name = mixer_str;

	fe_app_type_cfg_control[0].private_value = rtd->dai_link->be_id;

	fe_app_type_cfg_control[0].private_value = rtd->dai_link->id;



	if (rtd->compr->direction == SND_COMPRESS_PLAYBACK) {

		fe_app_type_cfg_control[0].put =
@@ -3789,7 +3789,7 @@ static int msm_compr_add_channel_map_control(struct snd_soc_pcm_runtime *rtd) 
	}



	pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",

		 __func__, rtd->dai_link->name, rtd->dai_link->be_id,

		 __func__, rtd->dai_link->name, rtd->dai_link->id,

		 rtd->dai_link->cpu_dai_name, rtd->pcm->device);



	ctl_len = strlen(mixer_ctl_name) + strlen(deviceNo) + 1;
@@ -3801,16 +3801,16 @@ static int msm_compr_add_channel_map_control(struct snd_soc_pcm_runtime *rtd) 
	snprintf(mixer_str, ctl_len, "%s%d", mixer_ctl_name, rtd->pcm->device);



	fe_channel_map_control[0].name = mixer_str;

	fe_channel_map_control[0].private_value = rtd->dai_link->be_id;

	fe_channel_map_control[0].private_value = rtd->dai_link->id;

	pr_debug("%s: Registering new mixer ctl %s\n", __func__, mixer_str);

	snd_soc_add_platform_controls(rtd->platform,

				fe_channel_map_control,

				ARRAY_SIZE(fe_channel_map_control));



	pdata = snd_soc_platform_get_drvdata(rtd->platform);

	pdata->ch_map[rtd->dai_link->be_id] =

	pdata->ch_map[rtd->dai_link->id] =

		 kzalloc(sizeof(struct msm_compr_ch_map), GFP_KERNEL);

	if (!pdata->ch_map[rtd->dai_link->be_id]) {

	if (!pdata->ch_map[rtd->dai_link->id]) {

		pr_err("%s: Could not allocate memory for channel map\n",

			__func__);

		kfree(mixer_str);

sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c

+7 −7
Original line number Diff line number Diff line
@@ -291,10 +291,10 @@ static int msm_pcm_open(struct snd_pcm_substream *substream) 
		}

		event.event_func = msm_pcm_route_event_handler;

		event.priv_data = (void *) pcm;

		msm_pcm_routing_reg_phy_stream(soc_pcm_tx->dai_link->be_id,

		msm_pcm_routing_reg_phy_stream(soc_pcm_tx->dai_link->id,

			pcm->audio_client->perf_mode,

			pcm->session_id, pcm->capture_substream->stream);

		msm_pcm_routing_reg_phy_stream_v2(soc_pcm_rx->dai_link->be_id,

		msm_pcm_routing_reg_phy_stream_v2(soc_pcm_rx->dai_link->id,

			pcm->audio_client->perf_mode,

			pcm->session_id, pcm->playback_substream->stream,

			event);
@@ -340,12 +340,12 @@ static void stop_pcm(struct msm_pcm_loopback *pcm) 


	if (pcm->playback_substream != NULL) {

		soc_pcm_rx = pcm->playback_substream->private_data;

		msm_pcm_routing_dereg_phy_stream(soc_pcm_rx->dai_link->be_id,

		msm_pcm_routing_dereg_phy_stream(soc_pcm_rx->dai_link->id,

				SNDRV_PCM_STREAM_PLAYBACK);

	}

	if (pcm->capture_substream != NULL) {

		soc_pcm_tx = pcm->capture_substream->private_data;

		msm_pcm_routing_dereg_phy_stream(soc_pcm_tx->dai_link->be_id,

		msm_pcm_routing_dereg_phy_stream(soc_pcm_tx->dai_link->id,

				SNDRV_PCM_STREAM_CAPTURE);

	}

	q6asm_audio_client_free(pcm->audio_client);
@@ -527,7 +527,7 @@ static int msm_pcm_add_volume_controls(struct snd_soc_pcm_runtime *rtd) 
	dev_dbg(rtd->dev, "%s, Volume cntrl add\n", __func__);

	ret = snd_pcm_add_volume_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,

				      NULL, 1,

				      rtd->dai_link->be_id,

				      rtd->dai_link->id,

				      &volume_info);

	if (ret < 0)

		return ret;
@@ -678,7 +678,7 @@ static int msm_pcm_add_app_type_controls(struct snd_soc_pcm_runtime *rtd) 
				strlen(deviceNo) + 1 + strlen(suffix) + 1;

		pr_debug("%s: Playback app type cntrl add\n", __func__);

		ret = snd_pcm_add_usr_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,

					NULL, 1, ctl_len, rtd->dai_link->be_id,

					NULL, 1, ctl_len, rtd->dai_link->id,

					&app_type_info);

		if (ret < 0)

			return ret;
@@ -694,7 +694,7 @@ static int msm_pcm_add_app_type_controls(struct snd_soc_pcm_runtime *rtd) 
				strlen(deviceNo) + 1 + strlen(suffix) + 1;

		pr_debug("%s: Capture app type cntrl add\n", __func__);

		ret = snd_pcm_add_usr_ctls(pcm, SNDRV_PCM_STREAM_CAPTURE,

					NULL, 1, ctl_len, rtd->dai_link->be_id,

					NULL, 1, ctl_len, rtd->dai_link->id,

					&app_type_info);

		if (ret < 0)

			return ret;