diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2014-05-20 23:22:19 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-21 19:20:11 -0400 |
commit | 7253e354e712d2cab7b640c62c8bb82653447c44 (patch) | |
tree | ef95602d86ec3ba29060f7bbd45cfc7808ab545f /sound/soc/samsung | |
parent | 55313bd3b09b68ce28e328e9dde79bfc389ea921 (diff) |
ASoC: samsung: Use devm_snd_soc_register_component
Replaced snd_soc_register_component with its devres equivalent,
devm_snd_soc_register_component.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/ac97.c | 8 | ||||
-rw-r--r-- | sound/soc/samsung/goni_wm8994.c | 9 | ||||
-rw-r--r-- | sound/soc/samsung/pcm.c | 8 | ||||
-rw-r--r-- | sound/soc/samsung/s3c-i2s-v2.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 14 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 18 | ||||
-rw-r--r-- | sound/soc/samsung/spdif.c | 10 |
7 files changed, 15 insertions, 54 deletions
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index fbce03bbdb2b..68d9303047e8 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -433,7 +433,7 @@ static int s3c_ac97_probe(struct platform_device *pdev) | |||
433 | goto err4; | 433 | goto err4; |
434 | } | 434 | } |
435 | 435 | ||
436 | ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component, | 436 | ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component, |
437 | s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai)); | 437 | s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai)); |
438 | if (ret) | 438 | if (ret) |
439 | goto err5; | 439 | goto err5; |
@@ -441,12 +441,10 @@ static int s3c_ac97_probe(struct platform_device *pdev) | |||
441 | ret = samsung_asoc_dma_platform_register(&pdev->dev); | 441 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
442 | if (ret) { | 442 | if (ret) { |
443 | dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); | 443 | dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); |
444 | goto err6; | 444 | goto err5; |
445 | } | 445 | } |
446 | 446 | ||
447 | return 0; | 447 | return 0; |
448 | err6: | ||
449 | snd_soc_unregister_component(&pdev->dev); | ||
450 | err5: | 448 | err5: |
451 | free_irq(irq_res->start, NULL); | 449 | free_irq(irq_res->start, NULL); |
452 | err4: | 450 | err4: |
@@ -461,8 +459,6 @@ static int s3c_ac97_remove(struct platform_device *pdev) | |||
461 | { | 459 | { |
462 | struct resource *irq_res; | 460 | struct resource *irq_res; |
463 | 461 | ||
464 | snd_soc_unregister_component(&pdev->dev); | ||
465 | |||
466 | irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | 462 | irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |
467 | if (irq_res) | 463 | if (irq_res) |
468 | free_irq(irq_res->start, NULL); | 464 | free_irq(irq_res->start, NULL); |
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index 415ad81999c4..9506d7617223 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c | |||
@@ -274,8 +274,8 @@ static int __init goni_init(void) | |||
274 | return -ENOMEM; | 274 | return -ENOMEM; |
275 | 275 | ||
276 | /* register voice DAI here */ | 276 | /* register voice DAI here */ |
277 | ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component, | 277 | ret = devm_snd_soc_register_component(&goni_snd_device->dev, |
278 | &voice_dai, 1); | 278 | &voice_component, &voice_dai, 1); |
279 | if (ret) { | 279 | if (ret) { |
280 | platform_device_put(goni_snd_device); | 280 | platform_device_put(goni_snd_device); |
281 | return ret; | 281 | return ret; |
@@ -284,17 +284,14 @@ static int __init goni_init(void) | |||
284 | platform_set_drvdata(goni_snd_device, &goni); | 284 | platform_set_drvdata(goni_snd_device, &goni); |
285 | ret = platform_device_add(goni_snd_device); | 285 | ret = platform_device_add(goni_snd_device); |
286 | 286 | ||
287 | if (ret) { | 287 | if (ret) |
288 | snd_soc_unregister_component(&goni_snd_device->dev); | ||
289 | platform_device_put(goni_snd_device); | 288 | platform_device_put(goni_snd_device); |
290 | } | ||
291 | 289 | ||
292 | return ret; | 290 | return ret; |
293 | } | 291 | } |
294 | 292 | ||
295 | static void __exit goni_exit(void) | 293 | static void __exit goni_exit(void) |
296 | { | 294 | { |
297 | snd_soc_unregister_component(&goni_snd_device->dev); | ||
298 | platform_device_unregister(goni_snd_device); | 295 | platform_device_unregister(goni_snd_device); |
299 | } | 296 | } |
300 | 297 | ||
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 38df2a86bd5f..90fcd522be1c 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
@@ -588,7 +588,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
588 | 588 | ||
589 | pm_runtime_enable(&pdev->dev); | 589 | pm_runtime_enable(&pdev->dev); |
590 | 590 | ||
591 | ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component, | 591 | ret = devm_snd_soc_register_component(&pdev->dev, &s3c_pcm_component, |
592 | &s3c_pcm_dai[pdev->id], 1); | 592 | &s3c_pcm_dai[pdev->id], 1); |
593 | if (ret != 0) { | 593 | if (ret != 0) { |
594 | dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret); | 594 | dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret); |
@@ -598,13 +598,11 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
598 | ret = samsung_asoc_dma_platform_register(&pdev->dev); | 598 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
599 | if (ret) { | 599 | if (ret) { |
600 | dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); | 600 | dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); |
601 | goto err6; | 601 | goto err5; |
602 | } | 602 | } |
603 | 603 | ||
604 | return 0; | 604 | return 0; |
605 | 605 | ||
606 | err6: | ||
607 | snd_soc_unregister_component(&pdev->dev); | ||
608 | err5: | 606 | err5: |
609 | clk_disable_unprepare(pcm->pclk); | 607 | clk_disable_unprepare(pcm->pclk); |
610 | clk_put(pcm->pclk); | 608 | clk_put(pcm->pclk); |
@@ -624,8 +622,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) | |||
624 | struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; | 622 | struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; |
625 | struct resource *mem_res; | 623 | struct resource *mem_res; |
626 | 624 | ||
627 | snd_soc_unregister_component(&pdev->dev); | ||
628 | |||
629 | pm_runtime_disable(&pdev->dev); | 625 | pm_runtime_disable(&pdev->dev); |
630 | 626 | ||
631 | iounmap(pcm->regs); | 627 | iounmap(pcm->regs); |
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index 79e7efb9283c..77a2ae50dc94 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c | |||
@@ -745,7 +745,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id, | |||
745 | dai_drv->suspend = s3c2412_i2s_suspend; | 745 | dai_drv->suspend = s3c2412_i2s_suspend; |
746 | dai_drv->resume = s3c2412_i2s_resume; | 746 | dai_drv->resume = s3c2412_i2s_resume; |
747 | 747 | ||
748 | return snd_soc_register_component(dev, cmp_drv, dai_drv, 1); | 748 | return devm_snd_soc_register_component(dev, cmp_drv, dai_drv, 1); |
749 | } | 749 | } |
750 | EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component); | 750 | EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component); |
751 | 751 | ||
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index f42da8df3e3c..843f315dcb3a 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c | |||
@@ -179,26 +179,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) | |||
179 | } | 179 | } |
180 | 180 | ||
181 | ret = samsung_asoc_dma_platform_register(&pdev->dev); | 181 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
182 | if (ret) { | 182 | if (ret) |
183 | pr_err("failed to register the DMA: %d\n", ret); | 183 | pr_err("failed to register the DMA: %d\n", ret); |
184 | goto err; | ||
185 | } | ||
186 | 184 | ||
187 | return 0; | ||
188 | err: | ||
189 | snd_soc_unregister_component(&pdev->dev); | ||
190 | return ret; | 185 | return ret; |
191 | } | 186 | } |
192 | 187 | ||
193 | static int s3c2412_iis_dev_remove(struct platform_device *pdev) | ||
194 | { | ||
195 | snd_soc_unregister_component(&pdev->dev); | ||
196 | return 0; | ||
197 | } | ||
198 | |||
199 | static struct platform_driver s3c2412_iis_driver = { | 188 | static struct platform_driver s3c2412_iis_driver = { |
200 | .probe = s3c2412_iis_dev_probe, | 189 | .probe = s3c2412_iis_dev_probe, |
201 | .remove = s3c2412_iis_dev_remove, | ||
202 | .driver = { | 190 | .driver = { |
203 | .name = "s3c2412-iis", | 191 | .name = "s3c2412-iis", |
204 | .owner = THIS_MODULE, | 192 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 8380443b1b39..4a6d206db222 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c | |||
@@ -475,34 +475,22 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) | |||
475 | { | 475 | { |
476 | int ret = 0; | 476 | int ret = 0; |
477 | 477 | ||
478 | ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, | 478 | ret = devm_snd_soc_register_component(&pdev->dev, |
479 | &s3c24xx_i2s_dai, 1); | 479 | &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1); |
480 | if (ret) { | 480 | if (ret) { |
481 | pr_err("failed to register the dai\n"); | 481 | pr_err("failed to register the dai\n"); |
482 | return ret; | 482 | return ret; |
483 | } | 483 | } |
484 | 484 | ||
485 | ret = samsung_asoc_dma_platform_register(&pdev->dev); | 485 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
486 | if (ret) { | 486 | if (ret) |
487 | pr_err("failed to register the dma: %d\n", ret); | 487 | pr_err("failed to register the dma: %d\n", ret); |
488 | goto err; | ||
489 | } | ||
490 | 488 | ||
491 | return 0; | ||
492 | err: | ||
493 | snd_soc_unregister_component(&pdev->dev); | ||
494 | return ret; | 489 | return ret; |
495 | } | 490 | } |
496 | 491 | ||
497 | static int s3c24xx_iis_dev_remove(struct platform_device *pdev) | ||
498 | { | ||
499 | snd_soc_unregister_component(&pdev->dev); | ||
500 | return 0; | ||
501 | } | ||
502 | |||
503 | static struct platform_driver s3c24xx_iis_driver = { | 492 | static struct platform_driver s3c24xx_iis_driver = { |
504 | .probe = s3c24xx_iis_dev_probe, | 493 | .probe = s3c24xx_iis_dev_probe, |
505 | .remove = s3c24xx_iis_dev_remove, | ||
506 | .driver = { | 494 | .driver = { |
507 | .name = "s3c24xx-iis", | 495 | .name = "s3c24xx-iis", |
508 | .owner = THIS_MODULE, | 496 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 7d89d016fa49..e93a93e296f4 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c | |||
@@ -427,8 +427,8 @@ static int spdif_probe(struct platform_device *pdev) | |||
427 | 427 | ||
428 | dev_set_drvdata(&pdev->dev, spdif); | 428 | dev_set_drvdata(&pdev->dev, spdif); |
429 | 429 | ||
430 | ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component, | 430 | ret = devm_snd_soc_register_component(&pdev->dev, |
431 | &samsung_spdif_dai, 1); | 431 | &samsung_spdif_component, &samsung_spdif_dai, 1); |
432 | if (ret != 0) { | 432 | if (ret != 0) { |
433 | dev_err(&pdev->dev, "fail to register dai\n"); | 433 | dev_err(&pdev->dev, "fail to register dai\n"); |
434 | goto err4; | 434 | goto err4; |
@@ -444,12 +444,10 @@ static int spdif_probe(struct platform_device *pdev) | |||
444 | ret = samsung_asoc_dma_platform_register(&pdev->dev); | 444 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
445 | if (ret) { | 445 | if (ret) { |
446 | dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); | 446 | dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); |
447 | goto err5; | 447 | goto err4; |
448 | } | 448 | } |
449 | 449 | ||
450 | return 0; | 450 | return 0; |
451 | err5: | ||
452 | snd_soc_unregister_component(&pdev->dev); | ||
453 | err4: | 451 | err4: |
454 | iounmap(spdif->regs); | 452 | iounmap(spdif->regs); |
455 | err3: | 453 | err3: |
@@ -467,8 +465,6 @@ static int spdif_remove(struct platform_device *pdev) | |||
467 | struct samsung_spdif_info *spdif = &spdif_info; | 465 | struct samsung_spdif_info *spdif = &spdif_info; |
468 | struct resource *mem_res; | 466 | struct resource *mem_res; |
469 | 467 | ||
470 | snd_soc_unregister_component(&pdev->dev); | ||
471 | |||
472 | iounmap(spdif->regs); | 468 | iounmap(spdif->regs); |
473 | 469 | ||
474 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 470 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |