diff options
| author | John Stultz <john.stultz@linaro.org> | 2017-04-11 22:15:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-11 23:20:55 +0300 |
| commit | e6d56d21bdcfd8968c1859bc1892608acad3e6d8 (patch) | |
| tree | 5f6842cbb108a58ca33ebc20694e97b3430f0d4a /sound/soc/hisilicon | |
| parent | 16c1c089b23aea681600d504102db950c1bd6ee4 (diff) | |
| download | linux-e6d56d21bdcfd8968c1859bc1892608acad3e6d8.tar.xz | |
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: John Stultz <john.stultz@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/hisilicon')
| -rw-r--r-- | sound/soc/hisilicon/hi6210-i2s.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 27553dca7cc6..45163e5202f5 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -591,22 +591,9 @@ 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; + return ret; } 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 = { .probe = hi6210_i2s_probe, - .remove = hi6210_i2s_remove, .driver = { .name = "hi6210_i2s", .of_match_table = hi6210_i2s_dt_ids, |