Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06b10ff9 authored by Tushar Behera's avatar Tushar Behera Committed by Mark Brown
Browse files

ASoC: samsung: Fix build error with dma function rename 



commit 85ff3c29 ("ASoC: samsung: Rename DMA platform registration
functions") renames the DMA registration functions. Fix the places where
it was left out.

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 85ff3c29

sound/soc/samsung/pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) 
		goto err5;

	}



	ret = asoc_dma_platform_register(&pdev->dev);

	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);

		goto err6;
@@ -623,7 +623,7 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) 
	struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];

	struct resource *mem_res;



	asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	pm_runtime_disable(&pdev->dev);

sound/soc/samsung/s3c2412-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = asoc_dma_platform_register(&pdev->dev);

	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

		pr_err("failed to register the DMA: %d\n", ret);

		goto err;
@@ -190,7 +190,7 @@ err: 


static int s3c2412_iis_dev_remove(struct platform_device *pdev)

{

	asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

	return 0;

}

sound/soc/samsung/s3c24xx-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = asoc_dma_platform_register(&pdev->dev);

	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

		pr_err("failed to register the dma: %d\n", ret);

		goto err;
@@ -494,7 +494,7 @@ err: 


static int s3c24xx_iis_dev_remove(struct platform_device *pdev)

{

	asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

	return 0;

}

sound/soc/samsung/spdif.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int spdif_probe(struct platform_device *pdev) 


	spdif->dma_playback = &spdif_stereo_out;



	ret = asoc_dma_platform_register(&pdev->dev);

	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "failed to register DMA: %d\n", ret);

		goto err5;
@@ -468,7 +468,7 @@ static int spdif_remove(struct platform_device *pdev) 
	struct samsung_spdif_info *spdif = &spdif_info;

	struct resource *mem_res;



	asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	iounmap(spdif->regs);