summaryrefslogtreecommitdiffstats
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-03-20 00:56:50 -0400
committerMark Brown <broonie@kernel.org>2019-03-21 10:52:51 -0400
commitad11e59f52d6fc75037ac3cb66dc711b83c1bbf8 (patch)
tree5d4e1f9b3c6e1acfaa81762695ab56a0f0e5fd40 /sound/soc/generic
parent8f7f298a333761a528e103cda3b42f3a416ad1ee (diff)
ASoC: simple-card-utils: rename asoc_simple_card_xxx() to asoc_simple_()
Current simple-card-utils is using asoc_simple_card_xxx() for each function naming, but it is very verbose. Thus it is easy to be over 80 char. This patch renames it to asoc_simple_xxx(). 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/audio-graph-card.c98
-rw-r--r--sound/soc/generic/simple-card-utils.c122
-rw-r--r--sound/soc/generic/simple-card.c98
3 files changed, 159 insertions, 159 deletions
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 3370b6fc6da2..8114b5ea9319 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -107,11 +107,11 @@ static int graph_get_dai_id(struct device_node *ep)
107 return id; 107 return id;
108} 108}
109 109
110static int asoc_simple_card_parse_dai(struct device_node *ep, 110static int asoc_simple_parse_dai(struct device_node *ep,
111 struct snd_soc_dai_link_component *dlc, 111 struct snd_soc_dai_link_component *dlc,
112 struct device_node **dai_of_node, 112 struct device_node **dai_of_node,
113 const char **dai_name, 113 const char **dai_name,
114 int *is_single_link) 114 int *is_single_link)
115{ 115{
116 struct device_node *node; 116 struct device_node *node;
117 struct of_phandle_args args; 117 struct of_phandle_args args;
@@ -154,18 +154,18 @@ static int asoc_simple_card_parse_dai(struct device_node *ep,
154 154
155static void graph_parse_convert(struct device *dev, 155static void graph_parse_convert(struct device *dev,
156 struct device_node *ep, 156 struct device_node *ep,
157 struct asoc_simple_card_data *adata) 157 struct asoc_simple_data *adata)
158{ 158{
159 struct device_node *top = dev->of_node; 159 struct device_node *top = dev->of_node;
160 struct device_node *port = of_get_parent(ep); 160 struct device_node *port = of_get_parent(ep);
161 struct device_node *ports = of_get_parent(port); 161 struct device_node *ports = of_get_parent(port);
162 struct device_node *node = of_graph_get_port_parent(ep); 162 struct device_node *node = of_graph_get_port_parent(ep);
163 163
164 asoc_simple_card_parse_convert(dev, top, NULL, adata); 164 asoc_simple_parse_convert(dev, top, NULL, adata);
165 asoc_simple_card_parse_convert(dev, node, PREFIX, adata); 165 asoc_simple_parse_convert(dev, node, PREFIX, adata);
166 asoc_simple_card_parse_convert(dev, ports, NULL, adata); 166 asoc_simple_parse_convert(dev, ports, NULL, adata);
167 asoc_simple_card_parse_convert(dev, port, NULL, adata); 167 asoc_simple_parse_convert(dev, port, NULL, adata);
168 asoc_simple_card_parse_convert(dev, ep, NULL, adata); 168 asoc_simple_parse_convert(dev, ep, NULL, adata);
169 169
170 of_node_put(port); 170 of_node_put(port);
171 of_node_put(ports); 171 of_node_put(ports);
@@ -239,22 +239,22 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
239 dai = 239 dai =
240 dai_props->cpu_dai = &priv->dais[li->dais++]; 240 dai_props->cpu_dai = &priv->dais[li->dais++];
241 241
242 ret = asoc_simple_card_parse_cpu(ep, dai_link, &is_single_links); 242 ret = asoc_simple_parse_cpu(ep, dai_link, &is_single_links);
243 if (ret) 243 if (ret)
244 return ret; 244 return ret;
245 245
246 ret = asoc_simple_card_parse_clk_cpu(dev, ep, dai_link, dai); 246 ret = asoc_simple_parse_clk_cpu(dev, ep, dai_link, dai);
247 if (ret < 0) 247 if (ret < 0)
248 return ret; 248 return ret;
249 249
250 ret = asoc_simple_card_set_dailink_name(dev, dai_link, 250 ret = asoc_simple_set_dailink_name(dev, dai_link,
251 "fe.%s", 251 "fe.%s",
252 dai_link->cpu_dai_name); 252 dai_link->cpu_dai_name);
253 if (ret < 0) 253 if (ret < 0)
254 return ret; 254 return ret;
255 255
256 /* card->num_links includes Codec */ 256 /* card->num_links includes Codec */
257 asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); 257 asoc_simple_canonicalize_cpu(dai_link, is_single_links);
258 } else { 258 } else {
259 struct snd_soc_codec_conf *cconf; 259 struct snd_soc_codec_conf *cconf;
260 260
@@ -273,17 +273,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
273 cconf = 273 cconf =
274 dai_props->codec_conf = &priv->codec_conf[li->conf++]; 274 dai_props->codec_conf = &priv->codec_conf[li->conf++];
275 275
276 ret = asoc_simple_card_parse_codec(ep, dai_link); 276 ret = asoc_simple_parse_codec(ep, dai_link);
277 if (ret < 0) 277 if (ret < 0)
278 return ret; 278 return ret;
279 279
280 ret = asoc_simple_card_parse_clk_codec(dev, ep, dai_link, dai); 280 ret = asoc_simple_parse_clk_codec(dev, ep, dai_link, dai);
281 if (ret < 0) 281 if (ret < 0)
282 return ret; 282 return ret;
283 283
284 ret = asoc_simple_card_set_dailink_name(dev, dai_link, 284 ret = asoc_simple_set_dailink_name(dev, dai_link,
285 "be.%s", 285 "be.%s",
286 codecs->dai_name); 286 codecs->dai_name);
287 if (ret < 0) 287 if (ret < 0)
288 return ret; 288 return ret;
289 289
@@ -301,14 +301,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
301 graph_parse_convert(dev, ep, &dai_props->adata); 301 graph_parse_convert(dev, ep, &dai_props->adata);
302 graph_parse_mclk_fs(top, ep, dai_props); 302 graph_parse_mclk_fs(top, ep, dai_props);
303 303
304 asoc_simple_card_canonicalize_platform(dai_link); 304 asoc_simple_canonicalize_platform(dai_link);
305 305
306 ret = asoc_simple_card_of_parse_tdm(ep, dai); 306 ret = asoc_simple_parse_tdm(ep, dai);
307 if (ret) 307 if (ret)
308 return ret; 308 return ret;
309 309
310 ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, 310 ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep,
311 NULL, &dai_link->dai_fmt); 311 NULL, &dai_link->dai_fmt);
312 if (ret < 0) 312 if (ret < 0)
313 return ret; 313 return ret;
314 314
@@ -350,47 +350,47 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
350 graph_parse_mclk_fs(top, cpu_ep, dai_props); 350 graph_parse_mclk_fs(top, cpu_ep, dai_props);
351 graph_parse_mclk_fs(top, codec_ep, dai_props); 351 graph_parse_mclk_fs(top, codec_ep, dai_props);
352 352
353 ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, 353 ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep,
354 NULL, &dai_link->dai_fmt); 354 NULL, &dai_link->dai_fmt);
355 if (ret < 0) 355 if (ret < 0)
356 return ret; 356 return ret;
357 357
358 ret = asoc_simple_card_parse_cpu(cpu_ep, dai_link, &single_cpu); 358 ret = asoc_simple_parse_cpu(cpu_ep, dai_link, &single_cpu);
359 if (ret < 0) 359 if (ret < 0)
360 return ret; 360 return ret;
361 361
362 ret = asoc_simple_card_parse_codec(codec_ep, dai_link); 362 ret = asoc_simple_parse_codec(codec_ep, dai_link);
363 if (ret < 0) 363 if (ret < 0)
364 return ret; 364 return ret;
365 365
366 ret = asoc_simple_card_of_parse_tdm(cpu_ep, cpu_dai); 366 ret = asoc_simple_parse_tdm(cpu_ep, cpu_dai);
367 if (ret < 0) 367 if (ret < 0)
368 return ret; 368 return ret;
369 369
370 ret = asoc_simple_card_of_parse_tdm(codec_ep, codec_dai); 370 ret = asoc_simple_parse_tdm(codec_ep, codec_dai);
371 if (ret < 0) 371 if (ret < 0)
372 return ret; 372 return ret;
373 373
374 ret = asoc_simple_card_parse_clk_cpu(dev, cpu_ep, dai_link, cpu_dai); 374 ret = asoc_simple_parse_clk_cpu(dev, cpu_ep, dai_link, cpu_dai);
375 if (ret < 0) 375 if (ret < 0)
376 return ret; 376 return ret;
377 377
378 ret = asoc_simple_card_parse_clk_codec(dev, codec_ep, dai_link, codec_dai); 378 ret = asoc_simple_parse_clk_codec(dev, codec_ep, dai_link, codec_dai);
379 if (ret < 0) 379 if (ret < 0)
380 return ret; 380 return ret;
381 381
382 ret = asoc_simple_card_set_dailink_name(dev, dai_link, 382 ret = asoc_simple_set_dailink_name(dev, dai_link,
383 "%s-%s", 383 "%s-%s",
384 dai_link->cpu_dai_name, 384 dai_link->cpu_dai_name,
385 dai_link->codecs->dai_name); 385 dai_link->codecs->dai_name);
386 if (ret < 0) 386 if (ret < 0)
387 return ret; 387 return ret;
388 388
389 dai_link->ops = &graph_ops; 389 dai_link->ops = &graph_ops;
390 dai_link->init = asoc_simple_dai_init; 390 dai_link->init = asoc_simple_dai_init;
391 391
392 asoc_simple_card_canonicalize_platform(dai_link); 392 asoc_simple_canonicalize_cpu(dai_link, single_cpu);
393 asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); 393 asoc_simple_canonicalize_platform(dai_link);
394 394
395 return 0; 395 return 0;
396} 396}
@@ -414,7 +414,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
414 struct device_node *codec_ep; 414 struct device_node *codec_ep;
415 struct device_node *codec_port; 415 struct device_node *codec_port;
416 struct device_node *codec_port_old = NULL; 416 struct device_node *codec_port_old = NULL;
417 struct asoc_simple_card_data adata; 417 struct asoc_simple_data adata;
418 int rc, ret; 418 int rc, ret;
419 419
420 /* loop for all listed CPU port */ 420 /* loop for all listed CPU port */
@@ -469,11 +469,11 @@ static int graph_parse_of(struct asoc_simple_priv *priv)
469 struct link_info li; 469 struct link_info li;
470 int ret; 470 int ret;
471 471
472 ret = asoc_simple_card_of_parse_widgets(card, NULL); 472 ret = asoc_simple_parse_widgets(card, NULL);
473 if (ret < 0) 473 if (ret < 0)
474 return ret; 474 return ret;
475 475
476 ret = asoc_simple_card_of_parse_routing(card, NULL); 476 ret = asoc_simple_parse_routing(card, NULL);
477 if (ret < 0) 477 if (ret < 0)
478 return ret; 478 return ret;
479 479
@@ -498,7 +498,7 @@ static int graph_parse_of(struct asoc_simple_priv *priv)
498 return ret; 498 return ret;
499 } 499 }
500 500
501 return asoc_simple_card_parse_card_name(card, NULL); 501 return asoc_simple_parse_card_name(card, NULL);
502} 502}
503 503
504static int graph_count_noml(struct asoc_simple_priv *priv, 504static int graph_count_noml(struct asoc_simple_priv *priv,
@@ -601,11 +601,11 @@ static int graph_card_probe(struct snd_soc_card *card)
601 struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); 601 struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);
602 int ret; 602 int ret;
603 603
604 ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL); 604 ret = asoc_simple_init_hp(card, &priv->hp_jack, NULL);
605 if (ret < 0) 605 if (ret < 0)
606 return ret; 606 return ret;
607 607
608 ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL); 608 ret = asoc_simple_init_mic(card, &priv->mic_jack, NULL);
609 if (ret < 0) 609 if (ret < 0)
610 return ret; 610 return ret;
611 611
@@ -637,7 +637,7 @@ static int graph_probe(struct platform_device *pdev)
637 if (!li.link || !li.dais) 637 if (!li.link || !li.dais)
638 return -EINVAL; 638 return -EINVAL;
639 639
640 ret = asoc_simple_card_init_priv(priv, &li); 640 ret = asoc_simple_init_priv(priv, &li);
641 if (ret < 0) 641 if (ret < 0)
642 return ret; 642 return ret;
643 643
@@ -665,7 +665,7 @@ static int graph_probe(struct platform_device *pdev)
665 665
666 return 0; 666 return 0;
667err: 667err:
668 asoc_simple_card_clean_reference(card); 668 asoc_simple_clean_reference(card);
669 669
670 return ret; 670 return ret;
671} 671}
@@ -674,7 +674,7 @@ static int graph_remove(struct platform_device *pdev)
674{ 674{
675 struct snd_soc_card *card = platform_get_drvdata(pdev); 675 struct snd_soc_card *card = platform_get_drvdata(pdev);
676 676
677 return asoc_simple_card_clean_reference(card); 677 return asoc_simple_clean_reference(card);
678} 678}
679 679
680static const struct of_device_id graph_of_match[] = { 680static const struct of_device_id graph_of_match[] = {
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 40cefbde6d9b..a794f767ff7f 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -14,8 +14,8 @@
14#include <sound/jack.h> 14#include <sound/jack.h>
15#include <sound/simple_card_utils.h> 15#include <sound/simple_card_utils.h>
16 16
17void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data, 17void asoc_simple_convert_fixup(struct asoc_simple_data *data,
18 struct snd_pcm_hw_params *params) 18 struct snd_pcm_hw_params *params)
19{ 19{
20 struct snd_interval *rate = hw_param_interval(params, 20 struct snd_interval *rate = hw_param_interval(params,
21 SNDRV_PCM_HW_PARAM_RATE); 21 SNDRV_PCM_HW_PARAM_RATE);
@@ -30,12 +30,12 @@ void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data,
30 channels->min = 30 channels->min =
31 channels->max = data->convert_channels; 31 channels->max = data->convert_channels;
32} 32}
33EXPORT_SYMBOL_GPL(asoc_simple_card_convert_fixup); 33EXPORT_SYMBOL_GPL(asoc_simple_convert_fixup);
34 34
35void asoc_simple_card_parse_convert(struct device *dev, 35void asoc_simple_parse_convert(struct device *dev,
36 struct device_node *np, 36 struct device_node *np,
37 char *prefix, 37 char *prefix,
38 struct asoc_simple_card_data *data) 38 struct asoc_simple_data *data)
39{ 39{
40 char prop[128]; 40 char prop[128];
41 41
@@ -50,13 +50,13 @@ void asoc_simple_card_parse_convert(struct device *dev,
50 snprintf(prop, sizeof(prop), "%s%s", prefix, "convert-channels"); 50 snprintf(prop, sizeof(prop), "%s%s", prefix, "convert-channels");
51 of_property_read_u32(np, prop, &data->convert_channels); 51 of_property_read_u32(np, prop, &data->convert_channels);
52} 52}
53EXPORT_SYMBOL_GPL(asoc_simple_card_parse_convert); 53EXPORT_SYMBOL_GPL(asoc_simple_parse_convert);
54 54
55int asoc_simple_card_parse_daifmt(struct device *dev, 55int asoc_simple_parse_daifmt(struct device *dev,
56 struct device_node *node, 56 struct device_node *node,
57 struct device_node *codec, 57 struct device_node *codec,
58 char *prefix, 58 char *prefix,
59 unsigned int *retfmt) 59 unsigned int *retfmt)
60{ 60{
61 struct device_node *bitclkmaster = NULL; 61 struct device_node *bitclkmaster = NULL;
62 struct device_node *framemaster = NULL; 62 struct device_node *framemaster = NULL;
@@ -92,11 +92,11 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
92 92
93 return 0; 93 return 0;
94} 94}
95EXPORT_SYMBOL_GPL(asoc_simple_card_parse_daifmt); 95EXPORT_SYMBOL_GPL(asoc_simple_parse_daifmt);
96 96
97int asoc_simple_card_set_dailink_name(struct device *dev, 97int asoc_simple_set_dailink_name(struct device *dev,
98 struct snd_soc_dai_link *dai_link, 98 struct snd_soc_dai_link *dai_link,
99 const char *fmt, ...) 99 const char *fmt, ...)
100{ 100{
101 va_list ap; 101 va_list ap;
102 char *name = NULL; 102 char *name = NULL;
@@ -115,10 +115,10 @@ int asoc_simple_card_set_dailink_name(struct device *dev,
115 115
116 return ret; 116 return ret;
117} 117}
118EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name); 118EXPORT_SYMBOL_GPL(asoc_simple_set_dailink_name);
119 119
120int asoc_simple_card_parse_card_name(struct snd_soc_card *card, 120int asoc_simple_parse_card_name(struct snd_soc_card *card,
121 char *prefix) 121 char *prefix)
122{ 122{
123 int ret; 123 int ret;
124 124
@@ -141,9 +141,9 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
141 141
142 return 0; 142 return 0;
143} 143}
144EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name); 144EXPORT_SYMBOL_GPL(asoc_simple_parse_card_name);
145 145
146static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai) 146static int asoc_simple_clk_enable(struct asoc_simple_dai *dai)
147{ 147{
148 if (dai) 148 if (dai)
149 return clk_prepare_enable(dai->clk); 149 return clk_prepare_enable(dai->clk);
@@ -151,18 +151,18 @@ static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai)
151 return 0; 151 return 0;
152} 152}
153 153
154static void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai) 154static void asoc_simple_clk_disable(struct asoc_simple_dai *dai)
155{ 155{
156 if (dai) 156 if (dai)
157 clk_disable_unprepare(dai->clk); 157 clk_disable_unprepare(dai->clk);
158} 158}
159 159
160int asoc_simple_card_parse_clk(struct device *dev, 160int asoc_simple_parse_clk(struct device *dev,
161 struct device_node *node, 161 struct device_node *node,
162 struct device_node *dai_of_node, 162 struct device_node *dai_of_node,
163 struct asoc_simple_dai *simple_dai, 163 struct asoc_simple_dai *simple_dai,
164 const char *dai_name, 164 const char *dai_name,
165 struct snd_soc_dai_link_component *dlc) 165 struct snd_soc_dai_link_component *dlc)
166{ 166{
167 struct clk *clk; 167 struct clk *clk;
168 u32 val; 168 u32 val;
@@ -202,7 +202,7 @@ int asoc_simple_card_parse_clk(struct device *dev,
202 202
203 return 0; 203 return 0;
204} 204}
205EXPORT_SYMBOL_GPL(asoc_simple_card_parse_clk); 205EXPORT_SYMBOL_GPL(asoc_simple_parse_clk);
206 206
207int asoc_simple_startup(struct snd_pcm_substream *substream) 207int asoc_simple_startup(struct snd_pcm_substream *substream)
208{ 208{
@@ -211,13 +211,13 @@ int asoc_simple_startup(struct snd_pcm_substream *substream)
211 struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); 211 struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
212 int ret; 212 int ret;
213 213
214 ret = asoc_simple_card_clk_enable(dai_props->cpu_dai); 214 ret = asoc_simple_clk_enable(dai_props->cpu_dai);
215 if (ret) 215 if (ret)
216 return ret; 216 return ret;
217 217
218 ret = asoc_simple_card_clk_enable(dai_props->codec_dai); 218 ret = asoc_simple_clk_enable(dai_props->codec_dai);
219 if (ret) 219 if (ret)
220 asoc_simple_card_clk_disable(dai_props->cpu_dai); 220 asoc_simple_clk_disable(dai_props->cpu_dai);
221 221
222 return ret; 222 return ret;
223} 223}
@@ -230,9 +230,9 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream)
230 struct simple_dai_props *dai_props = 230 struct simple_dai_props *dai_props =
231 simple_priv_to_props(priv, rtd->num); 231 simple_priv_to_props(priv, rtd->num);
232 232
233 asoc_simple_card_clk_disable(dai_props->cpu_dai); 233 asoc_simple_clk_disable(dai_props->cpu_dai);
234 234
235 asoc_simple_card_clk_disable(dai_props->codec_dai); 235 asoc_simple_clk_disable(dai_props->codec_dai);
236} 236}
237EXPORT_SYMBOL_GPL(asoc_simple_shutdown); 237EXPORT_SYMBOL_GPL(asoc_simple_shutdown);
238 238
@@ -299,13 +299,13 @@ int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
299 struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); 299 struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
300 struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); 300 struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
301 301
302 asoc_simple_card_convert_fixup(&dai_props->adata, params); 302 asoc_simple_convert_fixup(&dai_props->adata, params);
303 303
304 return 0; 304 return 0;
305} 305}
306EXPORT_SYMBOL_GPL(asoc_simple_be_hw_params_fixup); 306EXPORT_SYMBOL_GPL(asoc_simple_be_hw_params_fixup);
307 307
308static int asoc_simple_card_init_dai(struct snd_soc_dai *dai, 308static int asoc_simple_init_dai(struct snd_soc_dai *dai,
309 struct asoc_simple_dai *simple_dai) 309 struct asoc_simple_dai *simple_dai)
310{ 310{
311 int ret; 311 int ret;
@@ -343,13 +343,13 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
343 struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); 343 struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
344 int ret; 344 int ret;
345 345
346 ret = asoc_simple_card_init_dai(rtd->codec_dai, 346 ret = asoc_simple_init_dai(rtd->codec_dai,
347 dai_props->codec_dai); 347 dai_props->codec_dai);
348 if (ret < 0) 348 if (ret < 0)
349 return ret; 349 return ret;
350 350
351 ret = asoc_simple_card_init_dai(rtd->cpu_dai, 351 ret = asoc_simple_init_dai(rtd->cpu_dai,
352 dai_props->cpu_dai); 352 dai_props->cpu_dai);
353 if (ret < 0) 353 if (ret < 0)
354 return ret; 354 return ret;
355 355
@@ -357,16 +357,16 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
357} 357}
358EXPORT_SYMBOL_GPL(asoc_simple_dai_init); 358EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
359 359
360void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link) 360void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
361{ 361{
362 /* Assumes platform == cpu */ 362 /* Assumes platform == cpu */
363 if (!dai_link->platforms->of_node) 363 if (!dai_link->platforms->of_node)
364 dai_link->platforms->of_node = dai_link->cpu_of_node; 364 dai_link->platforms->of_node = dai_link->cpu_of_node;
365} 365}
366EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_platform); 366EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);
367 367
368void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link, 368void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
369 int is_single_links) 369 int is_single_links)
370{ 370{
371 /* 371 /*
372 * In soc_bind_dai_link() will check cpu name after 372 * In soc_bind_dai_link() will check cpu name after
@@ -380,9 +380,9 @@ void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
380 if (is_single_links) 380 if (is_single_links)
381 dai_link->cpu_dai_name = NULL; 381 dai_link->cpu_dai_name = NULL;
382} 382}
383EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_cpu); 383EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_cpu);
384 384
385int asoc_simple_card_clean_reference(struct snd_soc_card *card) 385int asoc_simple_clean_reference(struct snd_soc_card *card)
386{ 386{
387 struct snd_soc_dai_link *dai_link; 387 struct snd_soc_dai_link *dai_link;
388 int i; 388 int i;
@@ -393,10 +393,10 @@ int asoc_simple_card_clean_reference(struct snd_soc_card *card)
393 } 393 }
394 return 0; 394 return 0;
395} 395}
396EXPORT_SYMBOL_GPL(asoc_simple_card_clean_reference); 396EXPORT_SYMBOL_GPL(asoc_simple_clean_reference);
397 397
398int asoc_simple_card_of_parse_routing(struct snd_soc_card *card, 398int asoc_simple_parse_routing(struct snd_soc_card *card,
399 char *prefix) 399 char *prefix)
400{ 400{
401 struct device_node *node = card->dev->of_node; 401 struct device_node *node = card->dev->of_node;
402 char prop[128]; 402 char prop[128];
@@ -411,10 +411,10 @@ int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,
411 411
412 return snd_soc_of_parse_audio_routing(card, prop); 412 return snd_soc_of_parse_audio_routing(card, prop);
413} 413}
414EXPORT_SYMBOL_GPL(asoc_simple_card_of_parse_routing); 414EXPORT_SYMBOL_GPL(asoc_simple_parse_routing);
415 415
416int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card, 416int asoc_simple_parse_widgets(struct snd_soc_card *card,
417 char *prefix) 417 char *prefix)
418{ 418{
419 struct device_node *node = card->dev->of_node; 419 struct device_node *node = card->dev->of_node;
420 char prop[128]; 420 char prop[128];
@@ -430,11 +430,11 @@ int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card,
430 /* no widgets is not error */ 430 /* no widgets is not error */
431 return 0; 431 return 0;
432} 432}
433EXPORT_SYMBOL_GPL(asoc_simple_card_of_parse_widgets); 433EXPORT_SYMBOL_GPL(asoc_simple_parse_widgets);
434 434
435int asoc_simple_card_init_jack(struct snd_soc_card *card, 435int asoc_simple_init_jack(struct snd_soc_card *card,
436 struct asoc_simple_jack *sjack, 436 struct asoc_simple_jack *sjack,
437 int is_hp, char *prefix) 437 int is_hp, char *prefix)
438{ 438{
439 struct device *dev = card->dev; 439 struct device *dev = card->dev;
440 enum of_gpio_flags flags; 440 enum of_gpio_flags flags;
@@ -485,10 +485,10 @@ int asoc_simple_card_init_jack(struct snd_soc_card *card,
485 485
486 return 0; 486 return 0;
487} 487}
488EXPORT_SYMBOL_GPL(asoc_simple_card_init_jack); 488EXPORT_SYMBOL_GPL(asoc_simple_init_jack);
489 489
490int asoc_simple_card_init_priv(struct asoc_simple_priv *priv, 490int asoc_simple_init_priv(struct asoc_simple_priv *priv,
491 struct link_info *li) 491 struct link_info *li)
492{ 492{
493 struct snd_soc_card *card = simple_priv_to_card(priv); 493 struct snd_soc_card *card = simple_priv_to_card(priv);
494 struct device *dev = simple_priv_to_dev(priv); 494 struct device *dev = simple_priv_to_dev(priv);
@@ -513,7 +513,7 @@ int asoc_simple_card_init_priv(struct asoc_simple_priv *priv,
513 * 513 *
514 * "platform" might be removed 514 * "platform" might be removed
515 * see 515 * see
516 * simple-card-utils.c :: asoc_simple_card_canonicalize_platform() 516 * simple-card-utils.c :: asoc_simple_canonicalize_platform()
517 */ 517 */
518 for (i = 0; i < li->link; i++) { 518 for (i = 0; i < li->link; i++) {
519 dai_link[i].codecs = &dai_props[i].codecs; 519 dai_link[i].codecs = &dai_props[i].codecs;
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index d8560fb1f5de..dd9ac60d61f1 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -25,11 +25,11 @@ static const struct snd_soc_ops simple_ops = {
25 .hw_params = asoc_simple_hw_params, 25 .hw_params = asoc_simple_hw_params,
26}; 26};
27 27
28static int asoc_simple_card_parse_dai(struct device_node *node, 28static int asoc_simple_parse_dai(struct device_node *node,
29 struct snd_soc_dai_link_component *dlc, 29 struct snd_soc_dai_link_component *dlc,
30 struct device_node **dai_of_node, 30 struct device_node **dai_of_node,
31 const char **dai_name, 31 const char **dai_name,
32 int *is_single_link) 32 int *is_single_link)
33{ 33{
34 struct of_phandle_args args; 34 struct of_phandle_args args;
35 int ret; 35 int ret;
@@ -73,15 +73,15 @@ static int asoc_simple_card_parse_dai(struct device_node *node,
73 73
74static void simple_parse_convert(struct device *dev, 74static void simple_parse_convert(struct device *dev,
75 struct device_node *np, 75 struct device_node *np,
76 struct asoc_simple_card_data *adata) 76 struct asoc_simple_data *adata)
77{ 77{
78 struct device_node *top = dev->of_node; 78 struct device_node *top = dev->of_node;
79 struct device_node *node = of_get_parent(np); 79 struct device_node *node = of_get_parent(np);
80 80
81 asoc_simple_card_parse_convert(dev, top, PREFIX, adata); 81 asoc_simple_parse_convert(dev, top, PREFIX, adata);
82 asoc_simple_card_parse_convert(dev, node, PREFIX, adata); 82 asoc_simple_parse_convert(dev, node, PREFIX, adata);
83 asoc_simple_card_parse_convert(dev, node, NULL, adata); 83 asoc_simple_parse_convert(dev, node, NULL, adata);
84 asoc_simple_card_parse_convert(dev, np, NULL, adata); 84 asoc_simple_parse_convert(dev, np, NULL, adata);
85 85
86 of_node_put(node); 86 of_node_put(node);
87} 87}
@@ -156,21 +156,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
156 dai = 156 dai =
157 dai_props->cpu_dai = &priv->dais[li->dais++]; 157 dai_props->cpu_dai = &priv->dais[li->dais++];
158 158
159 ret = asoc_simple_card_parse_cpu(np, dai_link, &is_single_links); 159 ret = asoc_simple_parse_cpu(np, dai_link, &is_single_links);
160 if (ret) 160 if (ret)
161 return ret; 161 return ret;
162 162
163 ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, dai); 163 ret = asoc_simple_parse_clk_cpu(dev, np, dai_link, dai);
164 if (ret < 0) 164 if (ret < 0)
165 return ret; 165 return ret;
166 166
167 ret = asoc_simple_card_set_dailink_name(dev, dai_link, 167 ret = asoc_simple_set_dailink_name(dev, dai_link,
168 "fe.%s", 168 "fe.%s",
169 dai_link->cpu_dai_name); 169 dai_link->cpu_dai_name);
170 if (ret < 0) 170 if (ret < 0)
171 return ret; 171 return ret;
172 172
173 asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); 173 asoc_simple_canonicalize_cpu(dai_link, is_single_links);
174 } else { 174 } else {
175 struct snd_soc_codec_conf *cconf; 175 struct snd_soc_codec_conf *cconf;
176 176
@@ -189,17 +189,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
189 cconf = 189 cconf =
190 dai_props->codec_conf = &priv->codec_conf[li->conf++]; 190 dai_props->codec_conf = &priv->codec_conf[li->conf++];
191 191
192 ret = asoc_simple_card_parse_codec(np, dai_link); 192 ret = asoc_simple_parse_codec(np, dai_link);
193 if (ret < 0) 193 if (ret < 0)
194 return ret; 194 return ret;
195 195
196 ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, dai); 196 ret = asoc_simple_parse_clk_codec(dev, np, dai_link, dai);
197 if (ret < 0) 197 if (ret < 0)
198 return ret; 198 return ret;
199 199
200 ret = asoc_simple_card_set_dailink_name(dev, dai_link, 200 ret = asoc_simple_set_dailink_name(dev, dai_link,
201 "be.%s", 201 "be.%s",
202 codecs->dai_name); 202 codecs->dai_name);
203 if (ret < 0) 203 if (ret < 0)
204 return ret; 204 return ret;
205 205
@@ -215,14 +215,14 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
215 simple_parse_convert(dev, np, &dai_props->adata); 215 simple_parse_convert(dev, np, &dai_props->adata);
216 simple_parse_mclk_fs(top, np, codec, dai_props, prefix); 216 simple_parse_mclk_fs(top, np, codec, dai_props, prefix);
217 217
218 asoc_simple_card_canonicalize_platform(dai_link); 218 asoc_simple_canonicalize_platform(dai_link);
219 219
220 ret = asoc_simple_card_of_parse_tdm(np, dai); 220 ret = asoc_simple_parse_tdm(np, dai);
221 if (ret) 221 if (ret)
222 return ret; 222 return ret;
223 223
224 ret = asoc_simple_card_parse_daifmt(dev, node, codec, 224 ret = asoc_simple_parse_daifmt(dev, node, codec,
225 prefix, &dai_link->dai_fmt); 225 prefix, &dai_link->dai_fmt);
226 if (ret < 0) 226 if (ret < 0)
227 return ret; 227 return ret;
228 228
@@ -280,53 +280,53 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
280 codec_dai = 280 codec_dai =
281 dai_props->codec_dai = &priv->dais[li->dais++]; 281 dai_props->codec_dai = &priv->dais[li->dais++];
282 282
283 ret = asoc_simple_card_parse_daifmt(dev, node, codec, 283 ret = asoc_simple_parse_daifmt(dev, node, codec,
284 prefix, &dai_link->dai_fmt); 284 prefix, &dai_link->dai_fmt);
285 if (ret < 0) 285 if (ret < 0)
286 goto dai_link_of_err; 286 goto dai_link_of_err;
287 287
288 simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix); 288 simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix);
289 289
290 ret = asoc_simple_card_parse_cpu(cpu, dai_link, &single_cpu); 290 ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu);
291 if (ret < 0) 291 if (ret < 0)
292 goto dai_link_of_err; 292 goto dai_link_of_err;
293 293
294 ret = asoc_simple_card_parse_codec(codec, dai_link); 294 ret = asoc_simple_parse_codec(codec, dai_link);
295 if (ret < 0) 295 if (ret < 0)
296 goto dai_link_of_err; 296 goto dai_link_of_err;
297 297
298 ret = asoc_simple_card_parse_platform(plat, dai_link); 298 ret = asoc_simple_parse_platform(plat, dai_link);
299 if (ret < 0) 299 if (ret < 0)
300 goto dai_link_of_err; 300 goto dai_link_of_err;
301 301
302 ret = asoc_simple_card_of_parse_tdm(cpu, cpu_dai); 302 ret = asoc_simple_parse_tdm(cpu, cpu_dai);
303 if (ret < 0) 303 if (ret < 0)
304 goto dai_link_of_err; 304 goto dai_link_of_err;
305 305
306 ret = asoc_simple_card_of_parse_tdm(codec, codec_dai); 306 ret = asoc_simple_parse_tdm(codec, codec_dai);
307 if (ret < 0) 307 if (ret < 0)
308 goto dai_link_of_err; 308 goto dai_link_of_err;
309 309
310 ret = asoc_simple_card_parse_clk_cpu(dev, cpu, dai_link, cpu_dai); 310 ret = asoc_simple_parse_clk_cpu(dev, cpu, dai_link, cpu_dai);
311 if (ret < 0) 311 if (ret < 0)
312 goto dai_link_of_err; 312 goto dai_link_of_err;
313 313
314 ret = asoc_simple_card_parse_clk_codec(dev, codec, dai_link, codec_dai); 314 ret = asoc_simple_parse_clk_codec(dev, codec, dai_link, codec_dai);
315 if (ret < 0) 315 if (ret < 0)
316 goto dai_link_of_err; 316 goto dai_link_of_err;
317 317
318 ret = asoc_simple_card_set_dailink_name(dev, dai_link, 318 ret = asoc_simple_set_dailink_name(dev, dai_link,
319 "%s-%s", 319 "%s-%s",
320 dai_link->cpu_dai_name, 320 dai_link->cpu_dai_name,
321 dai_link->codecs->dai_name); 321 dai_link->codecs->dai_name);
322 if (ret < 0) 322 if (ret < 0)
323 goto dai_link_of_err; 323 goto dai_link_of_err;
324 324
325 dai_link->ops = &simple_ops; 325 dai_link->ops = &simple_ops;
326 dai_link->init = asoc_simple_dai_init; 326 dai_link->init = asoc_simple_dai_init;
327 327
328 asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); 328 asoc_simple_canonicalize_cpu(dai_link, single_cpu);
329 asoc_simple_card_canonicalize_platform(dai_link); 329 asoc_simple_canonicalize_platform(dai_link);
330 330
331dai_link_of_err: 331dai_link_of_err:
332 of_node_put(plat); 332 of_node_put(plat);
@@ -361,7 +361,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
361 361
362 /* loop for all dai-link */ 362 /* loop for all dai-link */
363 do { 363 do {
364 struct asoc_simple_card_data adata; 364 struct asoc_simple_data adata;
365 struct device_node *codec; 365 struct device_node *codec;
366 struct device_node *np; 366 struct device_node *np;
367 int num = of_get_child_count(node); 367 int num = of_get_child_count(node);
@@ -451,11 +451,11 @@ static int simple_parse_of(struct asoc_simple_priv *priv)
451 if (!top) 451 if (!top)
452 return -EINVAL; 452 return -EINVAL;
453 453
454 ret = asoc_simple_card_of_parse_widgets(card, PREFIX); 454 ret = asoc_simple_parse_widgets(card, PREFIX);
455 if (ret < 0) 455 if (ret < 0)
456 return ret; 456 return ret;
457 457
458 ret = asoc_simple_card_of_parse_routing(card, PREFIX); 458 ret = asoc_simple_parse_routing(card, PREFIX);
459 if (ret < 0) 459 if (ret < 0)
460 return ret; 460 return ret;
461 461
@@ -481,7 +481,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv)
481 return ret; 481 return ret;
482 } 482 }
483 483
484 ret = asoc_simple_card_parse_card_name(card, PREFIX); 484 ret = asoc_simple_parse_card_name(card, PREFIX);
485 if (ret < 0) 485 if (ret < 0)
486 return ret; 486 return ret;
487 487
@@ -587,11 +587,11 @@ static int simple_soc_probe(struct snd_soc_card *card)
587 struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); 587 struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);
588 int ret; 588 int ret;
589 589
590 ret = asoc_simple_card_init_hp(card, &priv->hp_jack, PREFIX); 590 ret = asoc_simple_init_hp(card, &priv->hp_jack, PREFIX);
591 if (ret < 0) 591 if (ret < 0)
592 return ret; 592 return ret;
593 593
594 ret = asoc_simple_card_init_mic(card, &priv->mic_jack, PREFIX); 594 ret = asoc_simple_init_mic(card, &priv->mic_jack, PREFIX);
595 if (ret < 0) 595 if (ret < 0)
596 return ret; 596 return ret;
597 597
@@ -622,7 +622,7 @@ static int simple_probe(struct platform_device *pdev)
622 if (!li.link || !li.dais) 622 if (!li.link || !li.dais)
623 return -EINVAL; 623 return -EINVAL;
624 624
625 ret = asoc_simple_card_init_priv(priv, &li); 625 ret = asoc_simple_init_priv(priv, &li);
626 if (ret < 0) 626 if (ret < 0)
627 return ret; 627 return ret;
628 628
@@ -691,7 +691,7 @@ static int simple_probe(struct platform_device *pdev)
691 691
692 return 0; 692 return 0;
693err: 693err:
694 asoc_simple_card_clean_reference(card); 694 asoc_simple_clean_reference(card);
695 695
696 return ret; 696 return ret;
697} 697}
@@ -700,7 +700,7 @@ static int simple_remove(struct platform_device *pdev)
700{ 700{
701 struct snd_soc_card *card = platform_get_drvdata(pdev); 701 struct snd_soc_card *card = platform_get_drvdata(pdev);
702 702
703 return asoc_simple_card_clean_reference(card); 703 return asoc_simple_clean_reference(card);
704} 704}
705 705
706static const struct of_device_id simple_of_match[] = { 706static const struct of_device_id simple_of_match[] = {
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-17 02:48:20 -0400