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

Commit 637c4497 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: pxa: Convert to devm_snd_soc_register_platform 



Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2cf32b7b

sound/soc/pxa/mmp-pcm.c

+1 −8
Original line number Diff line number Diff line
@@ -232,13 +232,7 @@ static int mmp_pcm_probe(struct platform_device *pdev) 
		mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max =

						pdata->period_max_capture;

	}

	return snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);

}



static int mmp_pcm_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	return 0;

	return devm_snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);

}



static struct platform_driver mmp_pcm_driver = {
@@ -247,7 +241,6 @@ static struct platform_driver mmp_pcm_driver = { 
	},



	.probe = mmp_pcm_probe,

	.remove = mmp_pcm_remove,

};



module_platform_driver(mmp_pcm_driver);

sound/soc/pxa/pxa2xx-pcm.c

+1 −8
Original line number Diff line number Diff line
@@ -124,13 +124,7 @@ static struct snd_soc_platform_driver pxa2xx_soc_platform = { 


static int pxa2xx_soc_platform_probe(struct platform_device *pdev)

{

	return snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform);

}



static int pxa2xx_soc_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	return 0;

	return devm_snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform);

}



#ifdef CONFIG_OF
@@ -147,7 +141,6 @@ static struct platform_driver pxa_pcm_driver = { 
	},



	.probe = pxa2xx_soc_platform_probe,

	.remove = pxa2xx_soc_platform_remove,

};



module_platform_driver(pxa_pcm_driver);