Skip to content

Commit

Permalink
ASoC: fsl: Use devm_snd_dmaengine_pcm_register()
Browse files Browse the repository at this point in the history
Makes the code shorter.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Dec 2, 2013
1 parent 75ab73b commit 7e6d18a
Showing 5 changed files with 2 additions and 27 deletions.
8 changes: 0 additions & 8 deletions sound/soc/fsl/fsl_spdif.c
Original file line number Diff line number Diff line change
@@ -1181,13 +1181,6 @@ static int fsl_spdif_probe(struct platform_device *pdev)
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[] = {
{ .compatible = "fsl,imx35-spdif", },
{}
@@ -1201,7 +1194,6 @@ static struct platform_driver fsl_spdif_driver = {
.of_match_table = fsl_spdif_dt_ids,
},
.probe = fsl_spdif_probe,
.remove = fsl_spdif_remove,
};

module_platform_driver(fsl_spdif_driver);
4 changes: 0 additions & 4 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
@@ -1109,8 +1109,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
return 0;

error_dai:
if (ssi_private->ssi_on_imx)
imx_pcm_dma_exit(pdev);
snd_soc_unregister_component(&pdev->dev);

error_dev:
@@ -1132,8 +1130,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)

if (!ssi_private->new_binding)
platform_device_unregister(ssi_private->pdev);
if (ssi_private->ssi_on_imx)
imx_pcm_dma_exit(pdev);
snd_soc_unregister_component(&pdev->dev);
device_remove_file(&pdev->dev, &ssi_private->dev_attr);
if (ssi_private->ssi_on_imx)
9 changes: 2 additions & 7 deletions sound/soc/fsl/imx-pcm-dma.c
Original file line number Diff line number Diff line change
@@ -61,16 +61,11 @@ static const struct snd_dmaengine_pcm_config imx_dmaengine_pcm_config = {

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_COMPAT);
}
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");
5 changes: 0 additions & 5 deletions sound/soc/fsl/imx-pcm.h
Original file line number Diff line number Diff line change
@@ -40,16 +40,11 @@ struct imx_pcm_fiq_params {

#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
int imx_pcm_dma_init(struct platform_device *pdev);
void imx_pcm_dma_exit(struct platform_device *pdev);
#else
static inline int imx_pcm_dma_init(struct platform_device *pdev)
{
return -ENODEV;
}

static inline void imx_pcm_dma_exit(struct platform_device *pdev)
{
}
#endif

#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
3 changes: 0 additions & 3 deletions sound/soc/fsl/imx-ssi.c
Original file line number Diff line number Diff line change
@@ -624,9 +624,6 @@ static int imx_ssi_remove(struct platform_device *pdev)
{
struct imx_ssi *ssi = platform_get_drvdata(pdev);

if (!ssi->dma_init)
imx_pcm_dma_exit(pdev);

if (!ssi->fiq_init)
imx_pcm_fiq_exit(pdev);

0 comments on commit 7e6d18a

Please sign in to comment.