|
@@ -241,7 +241,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
|
|
|
|
|
|
wdt->dev = &pdev->dev;
|
|
|
|
|
|
- wdt->clk = clk_get(&pdev->dev, NULL);
|
|
|
+ wdt->clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(wdt->clk)) {
|
|
|
/*
|
|
|
* Clock framework support is optional, continue on
|
|
@@ -251,10 +251,8 @@ static int sh_wdt_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
wdt->base = devm_ioremap_resource(wdt->dev, res);
|
|
|
- if (IS_ERR(wdt->base)) {
|
|
|
- rc = PTR_ERR(wdt->base);
|
|
|
- goto err;
|
|
|
- }
|
|
|
+ if (IS_ERR(wdt->base))
|
|
|
+ return PTR_ERR(wdt->base);
|
|
|
|
|
|
watchdog_set_nowayout(&sh_wdt_dev, nowayout);
|
|
|
watchdog_set_drvdata(&sh_wdt_dev, wdt);
|
|
@@ -277,7 +275,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
|
|
|
rc = watchdog_register_device(&sh_wdt_dev);
|
|
|
if (unlikely(rc)) {
|
|
|
dev_err(&pdev->dev, "Can't register watchdog (err=%d)\n", rc);
|
|
|
- goto err;
|
|
|
+ return rc;
|
|
|
}
|
|
|
|
|
|
init_timer(&wdt->timer);
|
|
@@ -292,11 +290,6 @@ static int sh_wdt_probe(struct platform_device *pdev)
|
|
|
pm_runtime_enable(&pdev->dev);
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-err:
|
|
|
- clk_put(wdt->clk);
|
|
|
-
|
|
|
- return rc;
|
|
|
}
|
|
|
|
|
|
static int sh_wdt_remove(struct platform_device *pdev)
|
|
@@ -308,7 +301,6 @@ static int sh_wdt_remove(struct platform_device *pdev)
|
|
|
watchdog_unregister_device(&sh_wdt_dev);
|
|
|
|
|
|
pm_runtime_disable(&pdev->dev);
|
|
|
- clk_put(wdt->clk);
|
|
|
|
|
|
return 0;
|
|
|
}
|