Commit a56257c6 authored by Andrew Jackson's avatar Andrew Jackson Committed by Mark Brown

ASoC: dwc: Switch to managed clock resource

Simplify error handling during probe by using managed clock
resources.
Signed-off-by: default avatarAndrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent afa8603c
...@@ -396,13 +396,13 @@ static int dw_i2s_probe(struct platform_device *pdev) ...@@ -396,13 +396,13 @@ static int dw_i2s_probe(struct platform_device *pdev)
dev->capability = pdata->cap; dev->capability = pdata->cap;
dev->i2s_clk_cfg = pdata->i2s_clk_cfg; 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)) if (IS_ERR(dev->clk))
return PTR_ERR(dev->clk); return PTR_ERR(dev->clk);
ret = clk_enable(dev->clk); ret = clk_enable(dev->clk);
if (ret < 0) if (ret < 0)
goto err_clk_put; return ret;
dev_set_drvdata(&pdev->dev, dev); dev_set_drvdata(&pdev->dev, dev);
ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,
...@@ -416,19 +416,13 @@ static int dw_i2s_probe(struct platform_device *pdev) ...@@ -416,19 +416,13 @@ static int dw_i2s_probe(struct platform_device *pdev)
err_clk_disable: err_clk_disable:
clk_disable(dev->clk); clk_disable(dev->clk);
err_clk_put:
clk_put(dev->clk);
return ret; return ret;
} }
static int dw_i2s_remove(struct platform_device *pdev) 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); snd_soc_unregister_component(&pdev->dev);
clk_put(dev->clk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment