| Message ID | 1401882133-11050-6-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: > The pm_runtime call should implicitly disable the device once the > probe is over if there is no explicit reference gained. There is no > need to call pm_runtime_suspend() before the pm_runtime_disable() > call. > > 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 | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > index cc6858d..b378aa0 100644 > --- a/drivers/mmc/host/sh_mmcif.c > +++ b/drivers/mmc/host/sh_mmcif.c > @@ -1443,7 +1443,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) > sh_mmcif_irqt, 0, name, host); > if (ret) { > dev_err(&pdev->dev, "request_irq error (%s)\n", name); > - goto err_irq; > + goto err_clk; > } > if (irq[1] >= 0) { > ret = devm_request_threaded_irq(&pdev->dev, irq[1], > @@ -1451,7 +1451,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) > 0, "sh_mmc:int", host); > if (ret) { > dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n"); > - goto err_irq; > + goto err_clk; > } > } > > @@ -1478,8 +1478,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) > > emmcaddh: > erqcd: > -err_irq: > - pm_runtime_suspend(&pdev->dev); > err_clk: > clk_disable_unprepare(host->hclk); > err_pm: > -- > 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 -- 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 cc6858d..b378aa0 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1443,7 +1443,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) sh_mmcif_irqt, 0, name, host); if (ret) { dev_err(&pdev->dev, "request_irq error (%s)\n", name); - goto err_irq; + goto err_clk; } if (irq[1] >= 0) { ret = devm_request_threaded_irq(&pdev->dev, irq[1], @@ -1451,7 +1451,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) 0, "sh_mmc:int", host); if (ret) { dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n"); - goto err_irq; + goto err_clk; } } @@ -1478,8 +1478,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) emmcaddh: erqcd: -err_irq: - pm_runtime_suspend(&pdev->dev); err_clk: clk_disable_unprepare(host->hclk); err_pm:
The pm_runtime call should implicitly disable the device once the probe is over if there is no explicit reference gained. There is no need to call pm_runtime_suspend() before the pm_runtime_disable() call. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- drivers/mmc/host/sh_mmcif.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)