Unverified Commit ad61b78e authored by Qinglang Miao's avatar Qinglang Miao Committed by Mark Brown
Browse files

ASoC: soc-core: use devm_snd_soc_register_card() 



Using devm_snd_soc_register_card() can make the code
shorter and cleaner.

Signed-off-by: default avatarQinglang Miao <miaoqinglang@huawei.com>
Link: https://lore.kernel.org/r/20200929112933.46977-1-miaoqinglang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5061e488

sound/soc/soc-core.c

+1 −11
Original line number Diff line number Diff line
@@ -1994,16 +1994,7 @@ static int soc_probe(struct platform_device *pdev) 
	/* Bodge while we unpick instantiation */

	card->dev = &pdev->dev;



	return snd_soc_register_card(card);

}



/* removes a socdev */

static int soc_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

	return devm_snd_soc_register_card(&pdev->dev, card);

}



int snd_soc_poweroff(struct device *dev)
@@ -2047,7 +2038,6 @@ static struct platform_driver soc_driver = { 
		.pm		= &snd_soc_pm_ops,

	},

	.probe		= soc_probe,

	.remove		= soc_remove,

};



/**