openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: atmel: atmel-pcm-dma.c: use devm_snd_dmaengine_pcm_register() 

We have devm_xxx version of snd_dmaengine_pcm_register,
let's use it.

This patch also removes related empty functions

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-28 13:07:05 +09:00 committed by Mark Brown
parent 8fc22fa4b2
commit 8af26493c0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/atmel/atmel-pcm-dma.c
View File

@ -111,16 +111,11 @@ static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = {
int atmel_pcm_dma_platform_register(struct device *dev) int atmel_pcm_dma_platform_register(struct device *dev)
{ {
return snd_dmaengine_pcm_register(dev, &atmel_dmaengine_pcm_config, 0); return devm_snd_dmaengine_pcm_register(dev,
&atmel_dmaengine_pcm_config, 0);
} }
EXPORT_SYMBOL(atmel_pcm_dma_platform_register); EXPORT_SYMBOL(atmel_pcm_dma_platform_register);
void atmel_pcm_dma_platform_unregister(struct device *dev)
{
snd_dmaengine_pcm_unregister(dev);
}
EXPORT_SYMBOL(atmel_pcm_dma_platform_unregister);
MODULE_AUTHOR("Bo Shen <voice.shen@atmel.com>"); MODULE_AUTHOR("Bo Shen <voice.shen@atmel.com>");
MODULE_DESCRIPTION("Atmel DMA based PCM module"); MODULE_DESCRIPTION("Atmel DMA based PCM module");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

5
sound/soc/atmel/atmel-pcm-pdc.c
View File

@ -393,11 +393,6 @@ int atmel_pcm_pdc_platform_register(struct device *dev)
} }
EXPORT_SYMBOL(atmel_pcm_pdc_platform_register); EXPORT_SYMBOL(atmel_pcm_pdc_platform_register);
void atmel_pcm_pdc_platform_unregister(struct device *dev)
{
}
EXPORT_SYMBOL(atmel_pcm_pdc_platform_unregister);
MODULE_AUTHOR("Sedji Gaouaou <sedji.gaouaou@atmel.com>"); MODULE_AUTHOR("Sedji Gaouaou <sedji.gaouaou@atmel.com>");
MODULE_DESCRIPTION("Atmel PCM module"); MODULE_DESCRIPTION("Atmel PCM module");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

8
sound/soc/atmel/atmel-pcm.h
View File

@ -72,28 +72,20 @@ struct atmel_pcm_dma_params {
#if IS_ENABLED(CONFIG_SND_ATMEL_SOC_PDC) #if IS_ENABLED(CONFIG_SND_ATMEL_SOC_PDC)
int atmel_pcm_pdc_platform_register(struct device *dev); int atmel_pcm_pdc_platform_register(struct device *dev);
void atmel_pcm_pdc_platform_unregister(struct device *dev);
#else #else
static inline int atmel_pcm_pdc_platform_register(struct device *dev) static inline int atmel_pcm_pdc_platform_register(struct device *dev)
{ {
return 0; return 0;
} }
static inline void atmel_pcm_pdc_platform_unregister(struct device *dev)
{
}
#endif #endif
#if IS_ENABLED(CONFIG_SND_ATMEL_SOC_DMA) #if IS_ENABLED(CONFIG_SND_ATMEL_SOC_DMA)
int atmel_pcm_dma_platform_register(struct device *dev); int atmel_pcm_dma_platform_register(struct device *dev);
void atmel_pcm_dma_platform_unregister(struct device *dev);
#else #else
static inline int atmel_pcm_dma_platform_register(struct device *dev) static inline int atmel_pcm_dma_platform_register(struct device *dev)
{ {
return 0; return 0;
} }
static inline void atmel_pcm_dma_platform_unregister(struct device *dev)
{
}
#endif #endif
#endif /* _ATMEL_PCM_H */ #endif /* _ATMEL_PCM_H */

11
sound/soc/atmel/atmel_ssc_dai.c
View File

@ -1012,16 +1012,6 @@ static int asoc_ssc_init(struct device *dev)
return 0; return 0;
} }
static void asoc_ssc_exit(struct device *dev)
{
struct ssc_device *ssc = dev_get_drvdata(dev);
if (ssc->pdata->use_dma)
atmel_pcm_dma_platform_unregister(dev);
else
atmel_pcm_pdc_platform_unregister(dev);
}
/** /**
* atmel_ssc_set_audio - Allocate the specified SSC for audio use. * atmel_ssc_set_audio - Allocate the specified SSC for audio use.
*/ */
@ -1050,7 +1040,6 @@ void atmel_ssc_put_audio(int ssc_id)
{ {
struct ssc_device *ssc = ssc_info[ssc_id].ssc; struct ssc_device *ssc = ssc_info[ssc_id].ssc;
asoc_ssc_exit(&ssc->pdev->dev);
ssc_free(ssc); ssc_free(ssc);
} }
EXPORT_SYMBOL_GPL(atmel_ssc_put_audio); EXPORT_SYMBOL_GPL(atmel_ssc_put_audio);