ASoC: dwc: Switch to managed clock resource

Simplify error handling during probe by using managed clock
resources.

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 23a7c13..10219b5 100644 (file)
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -396,13 +396,13 @@ static int dw_i2s_probe(struct platform_device *pdev)
 
        dev->capability = pdata->cap;
        dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
-       dev->clk = clk_get(&pdev->dev, NULL);
+       dev->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(dev->clk))
                return  PTR_ERR(dev->clk);
 
        ret = clk_enable(dev->clk);
        if (ret < 0)
-               goto err_clk_put;
+               return ret;
 
        dev_set_drvdata(&pdev->dev, dev);
        ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,
@@ -416,19 +416,13 @@ static int dw_i2s_probe(struct platform_device *pdev)
 
 err_clk_disable:
        clk_disable(dev->clk);
-err_clk_put:
-       clk_put(dev->clk);
        return ret;
 }
 
 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_put(dev->clk);
-
        return 0;
 }