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

Commit 70e7a023 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-pcm: Convert to use devm_snd_soc_register_platform() 



Remove the cleanup code related to the platform from the DAI drivers at the
same time to avoid breakage.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d5c6c59a

sound/soc/davinci/davinci-i2s.c

+0 −1
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ static int davinci_i2s_remove(struct platform_device *pdev) 
	struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_component(&pdev->dev);

	davinci_soc_platform_unregister(&pdev->dev);



	clk_disable(dev->clk);

	clk_put(dev->clk);

sound/soc/davinci/davinci-mcasp.c

+0 −15
Original line number Diff line number Diff line
@@ -1254,23 +1254,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 


static int davinci_mcasp_remove(struct platform_device *pdev)

{

	struct davinci_mcasp *mcasp = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_component(&pdev->dev);



	switch (mcasp->version) {

	case MCASP_VERSION_1:

	case MCASP_VERSION_2:

	case MCASP_VERSION_3:

		davinci_soc_platform_unregister(&pdev->dev);

		break;

	case MCASP_VERSION_4:

		/* Using the resource managed omap-pcm as platform driver */

		break;

	default:

		break;

	}



	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

sound/soc/davinci/davinci-pcm.c

+1 −7
Original line number Diff line number Diff line
@@ -852,16 +852,10 @@ static struct snd_soc_platform_driver davinci_soc_platform = { 


int davinci_soc_platform_register(struct device *dev)

{

	return snd_soc_register_platform(dev, &davinci_soc_platform);

	return devm_snd_soc_register_platform(dev, &davinci_soc_platform);

}

EXPORT_SYMBOL_GPL(davinci_soc_platform_register);



void davinci_soc_platform_unregister(struct device *dev)

{

	snd_soc_unregister_platform(dev);

}

EXPORT_SYMBOL_GPL(davinci_soc_platform_unregister);



MODULE_AUTHOR("Vladimir Barinov");

MODULE_DESCRIPTION("TI DAVINCI PCM DMA module");

MODULE_LICENSE("GPL");

sound/soc/davinci/davinci-pcm.h

+0 −4
Original line number Diff line number Diff line
@@ -31,15 +31,11 @@ struct davinci_pcm_dma_params { 


#if IS_ENABLED(CONFIG_SND_DAVINCI_SOC)

int davinci_soc_platform_register(struct device *dev);

void davinci_soc_platform_unregister(struct device *dev);

#else

static inline int davinci_soc_platform_register(struct device *dev)

{

	return 0;

}

static inline void davinci_soc_platform_unregister(struct device *dev)

{

}

#endif /* CONFIG_SND_DAVINCI_SOC */



#endif

sound/soc/davinci/davinci-vcif.c

+0 −1
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ static int davinci_vcif_probe(struct platform_device *pdev) 
static int davinci_vcif_remove(struct platform_device *pdev)

{

	snd_soc_unregister_component(&pdev->dev);

	davinci_soc_platform_unregister(&pdev->dev);



	return 0;

}