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

Commit 2fd7076a authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: pxa: Convert to devm_snd_soc_register_card 



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

sound/soc/pxa/brownstone.c

+1 −8
Original line number Diff line number Diff line
@@ -116,26 +116,19 @@ static int brownstone_probe(struct platform_device *pdev) 
	int ret;



	brownstone.dev = &pdev->dev;

	ret = snd_soc_register_card(&brownstone);

	ret = devm_snd_soc_register_card(&pdev->dev, &brownstone);

	if (ret)

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

				ret);

	return ret;

}



static int brownstone_remove(struct platform_device *pdev)

{

	snd_soc_unregister_card(&brownstone);

	return 0;

}



static struct platform_driver mmp_driver = {

	.driver		= {

		.name	= "brownstone-audio",

		.pm     = &snd_soc_pm_ops,

	},

	.probe		= brownstone_probe,

	.remove		= brownstone_remove,

};



module_platform_driver(mmp_driver);

sound/soc/pxa/corgi.c

+1 −10
Original line number Diff line number Diff line
@@ -295,28 +295,19 @@ static int corgi_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

	return ret;

}



static int corgi_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

}



static struct platform_driver corgi_driver = {

	.driver		= {

		.name	= "corgi-audio",

		.pm     = &snd_soc_pm_ops,

	},

	.probe		= corgi_probe,

	.remove		= corgi_remove,

};



module_platform_driver(corgi_driver);

sound/soc/pxa/e740_wm9705.c

+1 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int e740_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);
@@ -149,10 +149,7 @@ static int e740_probe(struct platform_device *pdev) 


static int e740_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	gpio_free_array(e740_audio_gpios, ARRAY_SIZE(e740_audio_gpios));

	snd_soc_unregister_card(card);

	return 0;

}

sound/soc/pxa/e750_wm9705.c

+1 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int e750_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);
@@ -131,10 +131,7 @@ static int e750_probe(struct platform_device *pdev) 


static int e750_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	gpio_free_array(e750_audio_gpios, ARRAY_SIZE(e750_audio_gpios));

	snd_soc_unregister_card(card);

	return 0;

}

sound/soc/pxa/e800_wm9712.c

+1 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int e800_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);
@@ -130,10 +130,7 @@ static int e800_probe(struct platform_device *pdev) 


static int e800_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	gpio_free_array(e800_audio_gpios, ARRAY_SIZE(e800_audio_gpios));

	snd_soc_unregister_card(card);

	return 0;

}