From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relmlor4.renesas.com ([210.160.252.174]:26333 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756637AbcEaJLz (ORCPT ); Tue, 31 May 2016 05:11:55 -0400 Message-ID: <8760tur414.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 32/39 v2] ASoC: rsrc-card: use asoc_simple_card_parse_tdm() To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="US-ASCII" Date: Tue, 31 May 2016 09:11:51 +0000 Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: From: Kuninori Morimoto Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsrc-card.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 16279d3..da3f219 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -161,15 +161,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) { /* BE is dummy */ dai_link->codec_of_node = NULL; @@ -235,6 +226,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; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Subject: [PATCH 32/39 v2] ASoC: rsrc-card: use asoc_simple_card_parse_tdm() Date: Tue, 31 May 2016 09:11:51 +0000 Message-ID: <8760tur414.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> Mime-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="US-ASCII" Return-path: In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org To: Mark Brown Cc: Linux-ALSA , Liam Girdwood , Simon , linux-renesas-soc@vger.kernel.org List-Id: alsa-devel@alsa-project.org From: Kuninori Morimoto Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsrc-card.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 16279d3..da3f219 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -161,15 +161,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) { /* BE is dummy */ dai_link->codec_of_node = NULL; @@ -235,6 +226,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; -- 1.9.1