ASoC: dwc: Register components with managed interface

Register SOC component using managed interface to
simplify error handling and future introduction of
device tree.

Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index a6327cc086c0e0139e5527359fb68289eb6097f2..1b9b18b790479a01b53f2857626325055d76a594 100644 (file)
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -481,7 +481,7 @@ static int dw_i2s_probe(struct platform_device *pdev)
                return ret;
 
        dev_set_drvdata(&pdev->dev, dev);
-       ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,
+       ret = devm_snd_soc_register_component(&pdev->dev, &dw_i2s_component,
                                         dw_i2s_dai, 1);
        if (ret != 0) {
                dev_err(&pdev->dev, "not able to register dai\n");
@@ -499,7 +499,6 @@ static int dw_i2s_remove(struct platform_device *pdev)
 {
        struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
 
-       snd_soc_unregister_component(&pdev->dev);
        clk_disable_unprepare(dev->clk);
 
        return 0;