diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-25 01:58:55 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-09-01 21:21:39 +0100 |
| commit | 9f645421b8219a466cca512ea5b123a5b170c59b (patch) | |
| tree | 848a70bddd2e00131262a592ce4cd6437c3d07e5 /sound/soc/generic | |
| parent | ASoC: simple-scu-card: code sync: move asoc_simple_card_of_match (diff) | |
| download | wireguard-linux-9f645421b8219a466cca512ea5b123a5b170c59b.tar.xz wireguard-linux-9f645421b8219a466cca512ea5b123a5b170c59b.zip | |
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>
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-scu-card.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index abe31dcfb4e7..b9973a56bcb0 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -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); 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) { int is_single_links = 0; @@ -178,6 +169,14 @@ static int asoc_simple_card_parse_links(struct device_node *np, 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); if (ret < 0) return ret; |