From 2bb68a610edd0224947d899ed6039256d212fb49 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Tue, 24 Apr 2012 12:36:25 +0300
Subject: [PATCH] --- yaml --- r: 307999 b: refs/heads/master c:
 c2f98956e3635a897737cc08a60539752aa00dd7 h: refs/heads/master i:   307997:
 760053b1348b5edee4f04c2cb2baf9ac23a6c85a   307995:
 f05d06c75190bc796392e95395877b75afc2bc4c   307991:
 edc8a7375cffe11b9476ac5182dc89164bee1dc6   307983:
 41d8fb122f85c9b2c563198026eae774cbb91da7   307967:
 a4eb8d801bcb15e2437bdb9b8b82f8212ec58d41 v: v3

---
 [refs]                                  |  2 +-
 trunk/sound/soc/omap/omap-abe-twl6040.c | 30 ++++++++-----------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 35612400bec9..ef1953a4063c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ec1be372139328b1aa3203eb1fd61d613b2d7fb
+refs/heads/master: c2f98956e3635a897737cc08a60539752aa00dd7
diff --git a/trunk/sound/soc/omap/omap-abe-twl6040.c b/trunk/sound/soc/omap/omap-abe-twl6040.c
index 93bb8eee22b3..31ab6fee8943 100644
--- a/trunk/sound/soc/omap/omap-abe-twl6040.c
+++ b/trunk/sound/soc/omap/omap-abe-twl6040.c
@@ -235,7 +235,7 @@ static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link twl6040_dmic_dai[] = {
+static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
 	{
 		.name = "TWL6040",
 		.stream_name = "TWL6040",
@@ -258,19 +258,6 @@ static struct snd_soc_dai_link twl6040_dmic_dai[] = {
 	},
 };
 
-static struct snd_soc_dai_link twl6040_only_dai[] = {
-	{
-		.name = "TWL6040",
-		.stream_name = "TWL6040",
-		.cpu_dai_name = "omap-mcpdm",
-		.codec_dai_name = "twl6040-legacy",
-		.platform_name = "omap-pcm-audio",
-		.codec_name = "twl6040-codec",
-		.init = omap_abe_twl6040_init,
-		.ops = &omap_abe_ops,
-	},
-};
-
 /* Audio machine driver */
 static struct snd_soc_card omap_abe_card = {
 	.owner = THIS_MODULE,
@@ -285,6 +272,7 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
 {
 	struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
 	struct snd_soc_card *card = &omap_abe_card;
+	int num_links = 0;
 	int ret;
 
 	card->dev = &pdev->dev;
@@ -306,13 +294,13 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	if (pdata->has_dmic) {
-		card->dai_link = twl6040_dmic_dai;
-		card->num_links = ARRAY_SIZE(twl6040_dmic_dai);
-	} else {
-		card->dai_link = twl6040_only_dai;
-		card->num_links = ARRAY_SIZE(twl6040_only_dai);
-	}
+	if (pdata->has_dmic)
+		num_links = 2;
+	else
+		num_links = 1;
+
+	card->dai_link = abe_twl6040_dai_links;
+	card->num_links = num_links;
 
 	ret = snd_soc_register_card(card);
 	if (ret)