diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-09 01:49:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-09 07:43:55 -0400 |
commit | 600ee2085515c03a7a4a6025034fefccf29e5a24 (patch) | |
tree | 47b48c386e6ebaf23c3302e4ab254a8b083cacf9 | |
parent | c958374f1cd22ec87f210985f9f9e1ba8b3df30b (diff) |
ASoC: rsrc-card: use asoc_simple_card_init_dai()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/sh/rcar/rsrc-card.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 82187e00eb12..1bf35634ebba 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c | |||
@@ -97,7 +97,6 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) | |||
97 | struct snd_soc_dai_link *dai_link; | 97 | struct snd_soc_dai_link *dai_link; |
98 | struct asoc_simple_dai *dai_props; | 98 | struct asoc_simple_dai *dai_props; |
99 | int num = rtd->num; | 99 | int num = rtd->num; |
100 | int ret; | ||
101 | 100 | ||
102 | dai_link = rsrc_priv_to_link(priv, num); | 101 | dai_link = rsrc_priv_to_link(priv, num); |
103 | dai_props = rsrc_priv_to_props(priv, num); | 102 | dai_props = rsrc_priv_to_props(priv, num); |
@@ -105,30 +104,7 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) | |||
105 | rtd->cpu_dai : | 104 | rtd->cpu_dai : |
106 | rtd->codec_dai; | 105 | rtd->codec_dai; |
107 | 106 | ||
108 | if (dai_props->sysclk) { | 107 | return asoc_simple_card_init_dai(dai, dai_props); |
109 | ret = snd_soc_dai_set_sysclk(dai, 0, dai_props->sysclk, 0); | ||
110 | if (ret && ret != -ENOTSUPP) { | ||
111 | dev_err(dai->dev, "set_sysclk error\n"); | ||
112 | goto err; | ||
113 | } | ||
114 | } | ||
115 | |||
116 | if (dai_props->slots) { | ||
117 | ret = snd_soc_dai_set_tdm_slot(dai, | ||
118 | dai_props->tx_slot_mask, | ||
119 | dai_props->rx_slot_mask, | ||
120 | dai_props->slots, | ||
121 | dai_props->slot_width); | ||
122 | if (ret && ret != -ENOTSUPP) { | ||
123 | dev_err(dai->dev, "set_tdm_slot error\n"); | ||
124 | goto err; | ||
125 | } | ||
126 | } | ||
127 | |||
128 | ret = 0; | ||
129 | |||
130 | err: | ||
131 | return ret; | ||
132 | } | 108 | } |
133 | 109 | ||
134 | static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, | 110 | static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, |