Commit 7e6d18ac authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: fsl: Use devm_snd_dmaengine_pcm_register()

Makes the code shorter.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 75ab73bc
...@@ -1181,13 +1181,6 @@ static int fsl_spdif_probe(struct platform_device *pdev) ...@@ -1181,13 +1181,6 @@ static int fsl_spdif_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int fsl_spdif_remove(struct platform_device *pdev)
{
imx_pcm_dma_exit(pdev);
return 0;
}
static const struct of_device_id fsl_spdif_dt_ids[] = { static const struct of_device_id fsl_spdif_dt_ids[] = {
{ .compatible = "fsl,imx35-spdif", }, { .compatible = "fsl,imx35-spdif", },
{} {}
...@@ -1201,7 +1194,6 @@ static struct platform_driver fsl_spdif_driver = { ...@@ -1201,7 +1194,6 @@ static struct platform_driver fsl_spdif_driver = {
.of_match_table = fsl_spdif_dt_ids, .of_match_table = fsl_spdif_dt_ids,
}, },
.probe = fsl_spdif_probe, .probe = fsl_spdif_probe,
.remove = fsl_spdif_remove,
}; };
module_platform_driver(fsl_spdif_driver); module_platform_driver(fsl_spdif_driver);
......
...@@ -1109,8 +1109,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) ...@@ -1109,8 +1109,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
return 0; return 0;
error_dai: error_dai:
if (ssi_private->ssi_on_imx)
imx_pcm_dma_exit(pdev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
error_dev: error_dev:
...@@ -1132,8 +1130,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) ...@@ -1132,8 +1130,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
if (!ssi_private->new_binding) if (!ssi_private->new_binding)
platform_device_unregister(ssi_private->pdev); platform_device_unregister(ssi_private->pdev);
if (ssi_private->ssi_on_imx)
imx_pcm_dma_exit(pdev);
snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
device_remove_file(&pdev->dev, &ssi_private->dev_attr); device_remove_file(&pdev->dev, &ssi_private->dev_attr);
if (ssi_private->ssi_on_imx) if (ssi_private->ssi_on_imx)
......
...@@ -61,16 +61,11 @@ static const struct snd_dmaengine_pcm_config imx_dmaengine_pcm_config = { ...@@ -61,16 +61,11 @@ static const struct snd_dmaengine_pcm_config imx_dmaengine_pcm_config = {
int imx_pcm_dma_init(struct platform_device *pdev) int imx_pcm_dma_init(struct platform_device *pdev)
{ {
return snd_dmaengine_pcm_register(&pdev->dev, &imx_dmaengine_pcm_config, return devm_snd_dmaengine_pcm_register(&pdev->dev,
&imx_dmaengine_pcm_config,
SND_DMAENGINE_PCM_FLAG_NO_RESIDUE | SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
SND_DMAENGINE_PCM_FLAG_COMPAT); SND_DMAENGINE_PCM_FLAG_COMPAT);
} }
EXPORT_SYMBOL_GPL(imx_pcm_dma_init); EXPORT_SYMBOL_GPL(imx_pcm_dma_init);
void imx_pcm_dma_exit(struct platform_device *pdev)
{
snd_dmaengine_pcm_unregister(&pdev->dev);
}
EXPORT_SYMBOL_GPL(imx_pcm_dma_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -40,16 +40,11 @@ struct imx_pcm_fiq_params { ...@@ -40,16 +40,11 @@ struct imx_pcm_fiq_params {
#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) #if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
int imx_pcm_dma_init(struct platform_device *pdev); int imx_pcm_dma_init(struct platform_device *pdev);
void imx_pcm_dma_exit(struct platform_device *pdev);
#else #else
static inline int imx_pcm_dma_init(struct platform_device *pdev) static inline int imx_pcm_dma_init(struct platform_device *pdev)
{ {
return -ENODEV; return -ENODEV;
} }
static inline void imx_pcm_dma_exit(struct platform_device *pdev)
{
}
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) #if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
......
...@@ -624,9 +624,6 @@ static int imx_ssi_remove(struct platform_device *pdev) ...@@ -624,9 +624,6 @@ static int imx_ssi_remove(struct platform_device *pdev)
{ {
struct imx_ssi *ssi = platform_get_drvdata(pdev); struct imx_ssi *ssi = platform_get_drvdata(pdev);
if (!ssi->dma_init)
imx_pcm_dma_exit(pdev);
if (!ssi->fiq_init) if (!ssi->fiq_init)
imx_pcm_fiq_exit(pdev); imx_pcm_fiq_exit(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment