| Message ID | 1401882133-11050-4-git-send-email-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 4 June 2014 13:42, Ben Dooks <ben.dooks@codethink.co.uk> wrote: > Use the devm_clk_get() code to get the clock and allow it to be freed > automatically on release. > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/mmc/host/sh_mmcif.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > index 3ed54c8..ae278a5 100644 > --- a/drivers/mmc/host/sh_mmcif.c > +++ b/drivers/mmc/host/sh_mmcif.c > @@ -1389,7 +1389,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) > > ret = mmc_of_parse(mmc); > if (ret < 0) > - goto eofparse; > + goto err_host; > > host = mmc_priv(mmc); > host->mmc = mmc; > @@ -1419,19 +1419,19 @@ static int sh_mmcif_probe(struct platform_device *pdev) > pm_runtime_enable(&pdev->dev); > host->power = false; > > - host->hclk = clk_get(&pdev->dev, NULL); > + host->hclk = devm_clk_get(&pdev->dev, NULL); > if (IS_ERR(host->hclk)) { > ret = PTR_ERR(host->hclk); > dev_err(&pdev->dev, "cannot get clock: %d\n", ret); > - goto eclkget; > + goto err_pm; > } > ret = sh_mmcif_clk_update(host); > if (ret < 0) > - goto eclkupdate; > + goto err_pm; > > ret = pm_runtime_resume(&pdev->dev); > if (ret < 0) > - goto eresume; > + goto err_clk; > > INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work); > > @@ -1482,13 +1482,11 @@ ereqirq1: > free_irq(irq[0], host); > ereqirq0: > pm_runtime_suspend(&pdev->dev); > -eresume: > +err_clk: > clk_disable_unprepare(host->hclk); > -eclkupdate: > - clk_put(host->hclk); > -eclkget: > +err_pm: > pm_runtime_disable(&pdev->dev); > -eofparse: > +err_host: > mmc_free_host(mmc); > return ret; > } > -- > 2.0.0.rc2 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 3ed54c8..ae278a5 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1389,7 +1389,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) ret = mmc_of_parse(mmc); if (ret < 0) - goto eofparse; + goto err_host; host = mmc_priv(mmc); host->mmc = mmc; @@ -1419,19 +1419,19 @@ static int sh_mmcif_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); host->power = false; - host->hclk = clk_get(&pdev->dev, NULL); + host->hclk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(host->hclk)) { ret = PTR_ERR(host->hclk); dev_err(&pdev->dev, "cannot get clock: %d\n", ret); - goto eclkget; + goto err_pm; } ret = sh_mmcif_clk_update(host); if (ret < 0) - goto eclkupdate; + goto err_pm; ret = pm_runtime_resume(&pdev->dev); if (ret < 0) - goto eresume; + goto err_clk; INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work); @@ -1482,13 +1482,11 @@ ereqirq1: free_irq(irq[0], host); ereqirq0: pm_runtime_suspend(&pdev->dev); -eresume: +err_clk: clk_disable_unprepare(host->hclk); -eclkupdate: - clk_put(host->hclk); -eclkget: +err_pm: pm_runtime_disable(&pdev->dev); -eofparse: +err_host: mmc_free_host(mmc); return ret; }
Use the devm_clk_get() code to get the clock and allow it to be freed automatically on release. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- drivers/mmc/host/sh_mmcif.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)