Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: hisilicon: Use devm_snd_soc_register_component

Browse source 
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: John Stultz <john.stultz@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
John Stultz 2017-04-11 12:15:18 -07:00 committed by Mark Brown
parent 16c1c089b2
commit e6d56d21bd
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/soc/hisilicon/hi6210-i2s.c
View file

@ -591,22 +591,9 @@ static int hi6210_i2s_probe(struct platform_device *pdev)
if (ret) if (ret)
return 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); &i2s->dai, 1);
if (ret) { return 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[] = { static const struct of_device_id hi6210_i2s_dt_ids[] = {
@ -618,7 +605,6 @@ MODULE_DEVICE_TABLE(of, hi6210_i2s_dt_ids);
static struct platform_driver hi6210_i2s_driver = { static struct platform_driver hi6210_i2s_driver = {
.probe = hi6210_i2s_probe, .probe = hi6210_i2s_probe,
.remove = hi6210_i2s_remove,
.driver = { .driver = {
.name = "hi6210_i2s", .name = "hi6210_i2s",
.of_match_table = hi6210_i2s_dt_ids, .of_match_table = hi6210_i2s_dt_ids,