Commit e6d56d21 authored by John Stultz's avatar John Stultz Committed by Mark Brown
Browse files

ASoC: hisilicon: Use devm_snd_soc_register_component 



Per feedback from Mark Brown, this patch updates the hi6210-i2s
driver to use devm_snd_soc_register_component which simplifies
the logic a bit.

Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 16c1c089

sound/soc/hisilicon/hi6210-i2s.c

+2 −16
Original line number Diff line number Diff line
@@ -591,24 +591,11 @@ static int hi6210_i2s_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = snd_soc_register_component(&pdev->dev, &hi6210_i2s_i2s_comp,

	ret = devm_snd_soc_register_component(&pdev->dev, &hi6210_i2s_i2s_comp,

					 &i2s->dai, 1);

	if (ret) {

		dev_err(&pdev->dev, "Failed to register dai\n");

	return ret;

}



	return 0;

}



static int hi6210_i2s_remove(struct platform_device *pdev)

{

	snd_soc_unregister_component(&pdev->dev);

	dev_set_drvdata(&pdev->dev, NULL);



	return 0;

}



static const struct of_device_id hi6210_i2s_dt_ids[] = {

	{ .compatible = "hisilicon,hi6210-i2s" },

	{ /* sentinel */ }
@@ -618,7 +605,6 @@ MODULE_DEVICE_TABLE(of, hi6210_i2s_dt_ids); 


static struct platform_driver hi6210_i2s_driver = {

	.probe = hi6210_i2s_probe,

	.remove = hi6210_i2s_remove,

	.driver = {

		.name = "hi6210_i2s",

		.of_match_table = hi6210_i2s_dt_ids,

CRA Git | Maintained and supported by SUSTech CRA and CCSE