openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: simple-scu-card: code sync: tidyup TDM setting position 

simple sound card family are using very similar style, but because of its
historical reason, there are small differences. For example pointer style,
function name, caller postion etc...
This patch tidyup TDM setting position

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2016-08-25 01:58:55 +00:00 committed by Mark Brown
parent f4d70709c8
commit 9f645421b8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/generic/simple-scu-card.c
View File

@ -111,15 +111,6 @@ static int asoc_simple_card_parse_links(struct device_node *np,
struct asoc_simple_dai *dai_props = simple_priv_to_props(priv, idx); struct asoc_simple_dai *dai_props = simple_priv_to_props(priv, idx);
int ret; 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) { if (is_fe) {
int is_single_links = 0; int is_single_links = 0;
@ -178,6 +169,14 @@ static int asoc_simple_card_parse_links(struct device_node *np,
PREFIX "prefix"); PREFIX "prefix");
} }
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;
ret = asoc_simple_card_canonicalize_dailink(dai_link); ret = asoc_simple_card_canonicalize_dailink(dai_link);
if (ret < 0) if (ret < 0)
return ret; return ret;