diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-08-22 08:45:02 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:00 -0400 |
commit | 06b10ff913f4d6b3e659e365ce5f70e82cca353c (patch) | |
tree | cb9fb52d20b67e6d4b876a0c0e3c8796d133d836 | |
parent | 85ff3c29d720fddddf35681bf8f244dfd91f66fa (diff) |
ASoC: samsung: Fix build error with dma function rename
commit 85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration
functions") renames the DMA registration functions. Fix the places where
it was left out.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/samsung/pcm.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/spdif.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 1566afe9ef52..e54256fc4b2c 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
@@ -594,7 +594,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
594 | goto err5; | 594 | goto err5; |
595 | } | 595 | } |
596 | 596 | ||
597 | ret = asoc_dma_platform_register(&pdev->dev); | 597 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
598 | if (ret) { | 598 | if (ret) { |
599 | dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); | 599 | dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); |
600 | goto err6; | 600 | goto err6; |
@@ -623,7 +623,7 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) | |||
623 | struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; | 623 | struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; |
624 | struct resource *mem_res; | 624 | struct resource *mem_res; |
625 | 625 | ||
626 | asoc_dma_platform_unregister(&pdev->dev); | 626 | samsung_asoc_dma_platform_unregister(&pdev->dev); |
627 | snd_soc_unregister_component(&pdev->dev); | 627 | snd_soc_unregister_component(&pdev->dev); |
628 | 628 | ||
629 | pm_runtime_disable(&pdev->dev); | 629 | pm_runtime_disable(&pdev->dev); |
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 47e23864ea72..ea885cb9f76c 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c | |||
@@ -176,7 +176,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) | |||
176 | return ret; | 176 | return ret; |
177 | } | 177 | } |
178 | 178 | ||
179 | ret = asoc_dma_platform_register(&pdev->dev); | 179 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
180 | if (ret) { | 180 | if (ret) { |
181 | pr_err("failed to register the DMA: %d\n", ret); | 181 | pr_err("failed to register the DMA: %d\n", ret); |
182 | goto err; | 182 | goto err; |
@@ -190,7 +190,7 @@ err: | |||
190 | 190 | ||
191 | static int s3c2412_iis_dev_remove(struct platform_device *pdev) | 191 | static int s3c2412_iis_dev_remove(struct platform_device *pdev) |
192 | { | 192 | { |
193 | asoc_dma_platform_unregister(&pdev->dev); | 193 | samsung_asoc_dma_platform_unregister(&pdev->dev); |
194 | snd_soc_unregister_component(&pdev->dev); | 194 | snd_soc_unregister_component(&pdev->dev); |
195 | return 0; | 195 | return 0; |
196 | } | 196 | } |
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 8b3414551a62..9c8ebd872fac 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c | |||
@@ -480,7 +480,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) | |||
480 | return ret; | 480 | return ret; |
481 | } | 481 | } |
482 | 482 | ||
483 | ret = asoc_dma_platform_register(&pdev->dev); | 483 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
484 | if (ret) { | 484 | if (ret) { |
485 | pr_err("failed to register the dma: %d\n", ret); | 485 | pr_err("failed to register the dma: %d\n", ret); |
486 | goto err; | 486 | goto err; |
@@ -494,7 +494,7 @@ err: | |||
494 | 494 | ||
495 | static int s3c24xx_iis_dev_remove(struct platform_device *pdev) | 495 | static int s3c24xx_iis_dev_remove(struct platform_device *pdev) |
496 | { | 496 | { |
497 | asoc_dma_platform_unregister(&pdev->dev); | 497 | samsung_asoc_dma_platform_unregister(&pdev->dev); |
498 | snd_soc_unregister_component(&pdev->dev); | 498 | snd_soc_unregister_component(&pdev->dev); |
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5ea70ab0ecb5..28487dcc4538 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c | |||
@@ -442,7 +442,7 @@ static int spdif_probe(struct platform_device *pdev) | |||
442 | 442 | ||
443 | spdif->dma_playback = &spdif_stereo_out; | 443 | spdif->dma_playback = &spdif_stereo_out; |
444 | 444 | ||
445 | ret = asoc_dma_platform_register(&pdev->dev); | 445 | ret = samsung_asoc_dma_platform_register(&pdev->dev); |
446 | if (ret) { | 446 | if (ret) { |
447 | dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); | 447 | dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); |
448 | goto err5; | 448 | goto err5; |
@@ -468,7 +468,7 @@ static int spdif_remove(struct platform_device *pdev) | |||
468 | struct samsung_spdif_info *spdif = &spdif_info; | 468 | struct samsung_spdif_info *spdif = &spdif_info; |
469 | struct resource *mem_res; | 469 | struct resource *mem_res; |
470 | 470 | ||
471 | asoc_dma_platform_unregister(&pdev->dev); | 471 | samsung_asoc_dma_platform_unregister(&pdev->dev); |
472 | snd_soc_unregister_component(&pdev->dev); | 472 | snd_soc_unregister_component(&pdev->dev); |
473 | 473 | ||
474 | iounmap(spdif->regs); | 474 | iounmap(spdif->regs); |