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

Commit 836b9d68 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: remove redundant code in dai link defintion"

parents 1164aa6f 05d52986

asoc/lahaina.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -5870,7 +5870,6 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(tx_cdcdma5_tx),

		SND_SOC_DAILINK_REG(tx_cdcdma5_tx),

		.num_codecs = ARRAY_SIZE(tx_cdcdma5_tx_codecs),

	},

	},

	{/* hw:x,40 */

	{/* hw:x,40 */

		.name = MSM_DAILINK_NAME(Media31),

		.name = MSM_DAILINK_NAME(Media31),
@@ -6555,7 +6554,6 @@ static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = { 
		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(wsa_dma_rx0),

		SND_SOC_DAILINK_REG(wsa_dma_rx0),

		.init = &msm_int_audrx_init,

		.init = &msm_int_audrx_init,

		.num_codecs = ARRAY_SIZE(wsa_dma_rx0_codecs),

	},

	},

	{

	{

		.name = LPASS_BE_WSA_CDC_DMA_RX_1,

		.name = LPASS_BE_WSA_CDC_DMA_RX_1,
@@ -6568,7 +6566,6 @@ static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(wsa_dma_rx1),

		SND_SOC_DAILINK_REG(wsa_dma_rx1),

		.num_codecs = ARRAY_SIZE(wsa_dma_rx1_codecs),

	},

	},

	{

	{

		.name = LPASS_BE_WSA_CDC_DMA_TX_1,

		.name = LPASS_BE_WSA_CDC_DMA_TX_1,
@@ -6580,7 +6577,6 @@ static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(wsa_dma_tx1),

		SND_SOC_DAILINK_REG(wsa_dma_tx1),

		.num_codecs = ARRAY_SIZE(wsa_dma_tx1_codecs),

	},

	},

};

};
@@ -6601,7 +6597,6 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = { 
		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(rx_dma_rx0),

		SND_SOC_DAILINK_REG(rx_dma_rx0),

		.init = &msm_aux_codec_init,

		.init = &msm_aux_codec_init,

		.num_codecs = ARRAY_SIZE(rx_dma_rx0_codecs),

	},

	},

	{

	{

		.name = LPASS_BE_RX_CDC_DMA_RX_1,

		.name = LPASS_BE_RX_CDC_DMA_RX_1,
@@ -6617,7 +6612,6 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(rx_dma_rx1),

		SND_SOC_DAILINK_REG(rx_dma_rx1),

		.num_codecs = ARRAY_SIZE(rx_dma_rx1_codecs),

	},

	},

	{

	{

		.name = LPASS_BE_RX_CDC_DMA_RX_2,

		.name = LPASS_BE_RX_CDC_DMA_RX_2,
@@ -6633,7 +6627,6 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(rx_dma_rx2),

		SND_SOC_DAILINK_REG(rx_dma_rx2),

		.num_codecs = ARRAY_SIZE(rx_dma_rx2_codecs),

	},

	},

	{

	{

		.name = LPASS_BE_RX_CDC_DMA_RX_3,

		.name = LPASS_BE_RX_CDC_DMA_RX_3,
@@ -6649,7 +6642,6 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(rx_dma_rx3),

		SND_SOC_DAILINK_REG(rx_dma_rx3),

		.num_codecs = ARRAY_SIZE(rx_dma_rx3_codecs),

	},

	},

	/* TX CDC DMA Backend DAI Links */

	/* TX CDC DMA Backend DAI Links */

	{

	{
@@ -6662,7 +6654,6 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(tx_dma_tx3),

		SND_SOC_DAILINK_REG(tx_dma_tx3),

		.num_codecs = ARRAY_SIZE(tx_dma_tx3_codecs),

	},

	},

	{

	{

		.name = LPASS_BE_TX_CDC_DMA_TX_4,

		.name = LPASS_BE_TX_CDC_DMA_TX_4,
@@ -6674,7 +6665,6 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = { 
		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_cdc_dma_be_ops,

		.ops = &msm_cdc_dma_be_ops,

		SND_SOC_DAILINK_REG(tx_dma_tx4),

		SND_SOC_DAILINK_REG(tx_dma_tx4),

		.num_codecs = ARRAY_SIZE(tx_dma_tx4_codecs),

	},

	},

};

};