diff mbox

[42/49] ASoC: rsrc-card: use asoc_simple_card_parse_tdm()

Message ID 87vb29oxtn.wl%kuninori.morimoto.gx@renesas.com (mailing list archive)
State Superseded
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Kuninori Morimoto May 20, 2016, 10:04 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/sh/rcar/rsrc-card.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 3cec0e8..de59a4a 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -158,15 +158,6 @@  static int rsrc_card_parse_links(struct device_node *np,
 	int is_single_links = 0;
 	int ret;
 
-	/* Parse TDM slot */
-	ret = snd_soc_of_parse_tdm_slot(np,
-					&dai_props->tx_slot_mask,
-					&dai_props->rx_slot_mask,
-					&dai_props->slots,
-					&dai_props->slot_width);
-	if (ret)
-		return ret;
-
 	if (is_fe) {
 		asoc_simple_card_parse_dpcm_fe(dai_link);
 
@@ -218,6 +209,10 @@  static int rsrc_card_parse_links(struct device_node *np,
 		}
 	}
 
+	ret = asoc_simple_card_parse_tdm(np, dai_props);
+	if (ret < 0)
+		return ret;
+
 	ret = asoc_simple_card_parse_dailink_name(dev, dai_link);
 	if (ret < 0)
 		return ret;