On Mon, Apr 29, 2013 at 06:15:26PM +0900, Jingoo Han wrote: > Use devm_clk_get() to make cleanup paths more simple. > > Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> > --- > drivers/watchdog/dw_wdt.c | 7 ++----- > 1 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c > index 2037669..2e70fd0 100644 > --- a/drivers/watchdog/dw_wdt.c > +++ b/drivers/watchdog/dw_wdt.c > @@ -305,13 +305,13 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) > if (IS_ERR(dw_wdt.regs)) > return PTR_ERR(dw_wdt.regs); > > - dw_wdt.clk = clk_get(&pdev->dev, NULL); > + dw_wdt.clk = devm_clk_get(&pdev->dev, NULL); > if (IS_ERR(dw_wdt.clk)) > return PTR_ERR(dw_wdt.clk); > > ret = clk_enable(dw_wdt.clk); > if (ret) > - goto out_put_clk; > + return ret; > > spin_lock_init(&dw_wdt.lock); > > @@ -327,8 +327,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) > > out_disable_clk: > clk_disable(dw_wdt.clk); > -out_put_clk: > - clk_put(dw_wdt.clk); > > return ret; > } > @@ -338,7 +336,6 @@ static int dw_wdt_drv_remove(struct platform_device *pdev) > misc_deregister(&dw_wdt_miscdev); > > clk_disable(dw_wdt.clk); > - clk_put(dw_wdt.clk); > > return 0; > } > -- > 1.7.2.5 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
