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

Commit 85ff3c29 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: samsung: Rename DMA platform registration functions 



The current naming with a simple asoc_ prefix is too generic for use in
multiplatform kernels.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarSangbeom Kim <sbkim73@samsung.com>
parent 37e60717

sound/soc/samsung/ac97.c

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static int s3c_ac97_probe(struct platform_device *pdev) 
	if (ret)

		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;
@@ -480,7 +480,7 @@ static int s3c_ac97_remove(struct platform_device *pdev) 
{

	struct resource *irq_res;



	asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

sound/soc/samsung/dma.c

+4 −4
Original line number Diff line number Diff line
@@ -437,17 +437,17 @@ static struct snd_soc_platform_driver samsung_asoc_platform = { 
	.pcm_free	= dma_free_dma_buffers,

};



int asoc_dma_platform_register(struct device *dev)

int samsung_asoc_dma_platform_register(struct device *dev)

{

	return snd_soc_register_platform(dev, &samsung_asoc_platform);

}

EXPORT_SYMBOL_GPL(asoc_dma_platform_register);

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);



void asoc_dma_platform_unregister(struct device *dev)

void samsung_asoc_dma_platform_unregister(struct device *dev)

{

	snd_soc_unregister_platform(dev);

}

EXPORT_SYMBOL_GPL(asoc_dma_platform_unregister);

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);



MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");

MODULE_DESCRIPTION("Samsung ASoC DMA Driver");

sound/soc/samsung/dma.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct s3c_dma_params { 
	char *ch_name;

};



int asoc_dma_platform_register(struct device *dev);

void asoc_dma_platform_unregister(struct device *dev);

int samsung_asoc_dma_platform_register(struct device *dev);

void samsung_asoc_dma_platform_unregister(struct device *dev);



#endif

sound/soc/samsung/i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
		snd_soc_register_component(&sec_dai->pdev->dev,

					   &samsung_i2s_component,

					   &sec_dai->i2s_dai_drv, 1);

		asoc_dma_platform_register(&pdev->dev);

		samsung_asoc_dma_platform_register(&pdev->dev);

		return 0;

	}
@@ -1263,7 +1263,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) 


	pm_runtime_enable(&pdev->dev);



	asoc_dma_platform_register(&pdev->dev);

	samsung_asoc_dma_platform_register(&pdev->dev);



	return 0;

err:
@@ -1293,7 +1293,7 @@ static int samsung_i2s_remove(struct platform_device *pdev) 
	i2s->pri_dai = NULL;

	i2s->sec_dai = NULL;



	asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	return 0;