summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2018-01-28 21:58:01 -0500
committerMark Brown <broonie@kernel.org>2018-02-12 06:46:14 -0500
commit03a0ddeda7ebafea8e99078581a50d856e3587a4 (patch)
treebc933b905a1ad07920935f5820c0143ce5b411d2
parent66bf428e555cdbf77c5a9cffefd8fca4af76ce9d (diff)
ASoC: soc-utils: replace codec to component
Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/soc-utils.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index e237858c9ed4..2d9e98bd1530 100644
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -288,7 +288,12 @@ static const struct snd_soc_component_driver dummy_platform = {
288 .ops = &dummy_dma_ops, 288 .ops = &dummy_dma_ops,
289}; 289};
290 290
291static const struct snd_soc_codec_driver dummy_codec; 291static const struct snd_soc_component_driver dummy_codec = {
292 .idle_bias_on = 1,
293 .use_pmdown_time = 1,
294 .endianness = 1,
295 .non_legacy_dai_naming = 1,
296};
292 297
293#define STUB_RATES SNDRV_PCM_RATE_8000_192000 298#define STUB_RATES SNDRV_PCM_RATE_8000_192000
294#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ 299#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S8 | \
@@ -338,33 +343,22 @@ static int snd_soc_dummy_probe(struct platform_device *pdev)
338{ 343{
339 int ret; 344 int ret;
340 345
341 ret = snd_soc_register_codec(&pdev->dev, &dummy_codec, &dummy_dai, 1); 346 ret = devm_snd_soc_register_component(&pdev->dev,
347 &dummy_codec, &dummy_dai, 1);
342 if (ret < 0) 348 if (ret < 0)
343 return ret; 349 return ret;
344 350
345 ret = devm_snd_soc_register_component(&pdev->dev, &dummy_platform, 351 ret = devm_snd_soc_register_component(&pdev->dev, &dummy_platform,
346 NULL, 0); 352 NULL, 0);
347 if (ret < 0) {
348 snd_soc_unregister_codec(&pdev->dev);
349 return ret;
350 }
351 353
352 return ret; 354 return ret;
353} 355}
354 356
355static int snd_soc_dummy_remove(struct platform_device *pdev)
356{
357 snd_soc_unregister_codec(&pdev->dev);
358
359 return 0;
360}
361
362static struct platform_driver soc_dummy_driver = { 357static struct platform_driver soc_dummy_driver = {
363 .driver = { 358 .driver = {
364 .name = "snd-soc-dummy", 359 .name = "snd-soc-dummy",
365 }, 360 },
366 .probe = snd_soc_dummy_probe, 361 .probe = snd_soc_dummy_probe,
367 .remove = snd_soc_dummy_remove,
368}; 362};
369 363
370static struct platform_device *soc_dummy_dev; 364static struct platform_device *soc_dummy_dev;