Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/fsl/fsl_spdif.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

sound/soc/fsl/fsl_ssi.c

+0 −4
Original line number Diff line number Diff line
@@ -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)

sound/soc/fsl/imx-pcm-dma.c

+2 −7
Original line number Diff line number Diff line
@@ -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");

sound/soc/fsl/imx-pcm.h

+0 −5
Original line number Diff line number Diff line
@@ -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)

sound/soc/fsl/imx-ssi.c

+0 −3
Original line number Diff line number Diff line
@@ -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);