korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: samsung: Use devm_snd_soc_register_platform

Browse Source 
Replaced snd_soc_register_platform with devm_snd_soc_register_platform
in samsung_asoc_dma_platform_register(). This makes the function
samsung_asoc_dma_platform_unregister() redundant. This is removed and
all its users are updated.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Tushar Behera 2014-05-21 08:52:18 +05:30 committed by Mark Brown
parent c583883ecd
commit 55313bd3b0
10 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

@ -445,16 +445,10 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
int samsung_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 devm_snd_soc_register_platform(dev, &samsung_asoc_platform);
} }
EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register); EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
void samsung_asoc_dma_platform_unregister(struct device *dev)
{
snd_soc_unregister_platform(dev);
}
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");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

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

@ -33,6 +33,5 @@ void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
struct s3c_dma_params *playback, struct s3c_dma_params *playback,
struct s3c_dma_params *capture); struct s3c_dma_params *capture);
int samsung_asoc_dma_platform_register(struct device *dev); int samsung_asoc_dma_platform_register(struct device *dev);
void samsung_asoc_dma_platform_unregister(struct device *dev);
#endif #endif

13
sound/soc/samsung/dmaengine.c
View File

@ -66,18 +66,13 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
int samsung_asoc_dma_platform_register(struct device *dev) int samsung_asoc_dma_platform_register(struct device *dev)
{ {
return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config, return devm_snd_dmaengine_pcm_register(dev,
SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME | &samsung_dmaengine_pcm_config,
SND_DMAENGINE_PCM_FLAG_COMPAT); SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |
SND_DMAENGINE_PCM_FLAG_COMPAT);
} }
EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register); EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
void samsung_asoc_dma_platform_unregister(struct device *dev)
{
return snd_dmaengine_pcm_unregister(dev);
}
EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);
MODULE_AUTHOR("Mark Brown <broonie@linaro.org>"); MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
MODULE_DESCRIPTION("Samsung dmaengine ASoC driver"); MODULE_DESCRIPTION("Samsung dmaengine ASoC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

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

@ -1295,8 +1295,6 @@ 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;
samsung_asoc_dma_platform_unregister(&pdev->dev);
return 0; return 0;
} }

9
sound/soc/samsung/idma.c
View File

@ -413,13 +413,7 @@ static int asoc_idma_platform_probe(struct platform_device *pdev)
if (idma_irq < 0) if (idma_irq < 0)
return idma_irq; return idma_irq;
return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform); return devm_snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
}
static int asoc_idma_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
} }
static struct platform_driver asoc_idma_driver = { static struct platform_driver asoc_idma_driver = {
@ -429,7 +423,6 @@ static struct platform_driver asoc_idma_driver = {
}, },
.probe = asoc_idma_platform_probe, .probe = asoc_idma_platform_probe,
.remove = asoc_idma_platform_remove,
}; };
module_platform_driver(asoc_idma_driver); module_platform_driver(asoc_idma_driver);

1
sound/soc/samsung/pcm.c
View File

@ -624,7 +624,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev)
struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
struct resource *mem_res; struct resource *mem_res;
samsung_asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);

1
sound/soc/samsung/s3c2412-i2s.c
View File

@ -192,7 +192,6 @@ err:
static int s3c2412_iis_dev_remove(struct platform_device *pdev) static int s3c2412_iis_dev_remove(struct platform_device *pdev)
{ {
samsung_asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
return 0; return 0;
} }

1
sound/soc/samsung/s3c24xx-i2s.c
View File

@ -496,7 +496,6 @@ err:
static int s3c24xx_iis_dev_remove(struct platform_device *pdev) static int s3c24xx_iis_dev_remove(struct platform_device *pdev)
{ {
samsung_asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
return 0; return 0;
} }

1
sound/soc/samsung/spdif.c
View File

@ -467,7 +467,6 @@ static int spdif_remove(struct platform_device *pdev)
struct samsung_spdif_info *spdif = &spdif_info; struct samsung_spdif_info *spdif = &spdif_info;
struct resource *mem_res; struct resource *mem_res;
samsung_asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
iounmap(spdif->regs); iounmap(spdif->regs);