hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
This commit is contained in:
Mark Brown 2013-08-19 22:59:05 +01:00
parent 37e6071787
commit 85ff3c29d7
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/samsung/ac97.c
View File

@ -457,7 +457,7 @@ static int s3c_ac97_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err5; goto err5;
ret = asoc_dma_platform_register(&pdev->dev); ret = samsung_asoc_dma_platform_register(&pdev->dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
goto err6; goto err6;
@ -480,7 +480,7 @@ static int s3c_ac97_remove(struct platform_device *pdev)
{ {
struct resource *irq_res; struct resource *irq_res;
asoc_dma_platform_unregister(&pdev->dev); samsung_asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

8
sound/soc/samsung/dma.c
View File

@ -437,17 +437,17 @@ static struct snd_soc_platform_driver samsung_asoc_platform = {
.pcm_free = dma_free_dma_buffers, .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); 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); 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_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
MODULE_DESCRIPTION("Samsung ASoC DMA Driver"); MODULE_DESCRIPTION("Samsung ASoC DMA Driver");

4
sound/soc/samsung/dma.h
View File

@ -22,7 +22,7 @@ struct s3c_dma_params {
char *ch_name; char *ch_name;
}; };
int asoc_dma_platform_register(struct device *dev); int samsung_asoc_dma_platform_register(struct device *dev);
void asoc_dma_platform_unregister(struct device *dev); void samsung_asoc_dma_platform_unregister(struct device *dev);
#endif #endif

6
sound/soc/samsung/i2s.c
View File

@ -1146,7 +1146,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
snd_soc_register_component(&sec_dai->pdev->dev, snd_soc_register_component(&sec_dai->pdev->dev,
&samsung_i2s_component, &samsung_i2s_component,
&sec_dai->i2s_dai_drv, 1); &sec_dai->i2s_dai_drv, 1);
asoc_dma_platform_register(&pdev->dev); samsung_asoc_dma_platform_register(&pdev->dev);
return 0; return 0;
} }
@ -1263,7 +1263,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
asoc_dma_platform_register(&pdev->dev); samsung_asoc_dma_platform_register(&pdev->dev);
return 0; return 0;
err: err:
@ -1293,7 +1293,7 @@ static int samsung_i2s_remove(struct platform_device *pdev)
i2s->pri_dai = NULL; i2s->pri_dai = NULL;
i2s->sec_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); snd_soc_unregister_component(&pdev->dev);
return 0; return 0;