Commit 6330c707 authored by Sachin Kamat's avatar Sachin Kamat Committed by Wim Van Sebroeck

watchdog: Convert to devm_ioremap_resource()

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent e0fd9aff
...@@ -253,11 +253,9 @@ static int ath79_wdt_probe(struct platform_device *pdev) ...@@ -253,11 +253,9 @@ static int ath79_wdt_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
wdt_base = devm_request_and_ioremap(&pdev->dev, res); wdt_base = devm_ioremap_resource(&pdev->dev, res);
if (!wdt_base) { if (IS_ERR(wdt_base))
dev_err(&pdev->dev, "unable to remap memory region\n"); return PTR_ERR(wdt_base);
return -ENOMEM;
}
wdt_clk = devm_clk_get(&pdev->dev, "wdt"); wdt_clk = devm_clk_get(&pdev->dev, "wdt");
if (IS_ERR(wdt_clk)) if (IS_ERR(wdt_clk))
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/err.h>
#define MODULE_NAME "DAVINCI-WDT: " #define MODULE_NAME "DAVINCI-WDT: "
...@@ -221,11 +222,9 @@ static int davinci_wdt_probe(struct platform_device *pdev) ...@@ -221,11 +222,9 @@ static int davinci_wdt_probe(struct platform_device *pdev)
return -ENOENT; return -ENOENT;
} }
wdt_base = devm_request_and_ioremap(dev, wdt_mem); wdt_base = devm_ioremap_resource(dev, wdt_mem);
if (!wdt_base) { if (IS_ERR(wdt_base))
dev_err(dev, "ioremap failed\n"); return PTR_ERR(wdt_base);
return -EADDRNOTAVAIL;
}
ret = misc_register(&davinci_wdt_miscdev); ret = misc_register(&davinci_wdt_miscdev);
if (ret < 0) { if (ret < 0) {
......
...@@ -330,10 +330,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev) ...@@ -330,10 +330,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
} }
/* get the memory region for the watchdog timer */ /* get the memory region for the watchdog timer */
wdt_base = devm_request_and_ioremap(dev, wdt_mem); wdt_base = devm_ioremap_resource(dev, wdt_mem);
if (wdt_base == NULL) { if (IS_ERR(wdt_base)) {
dev_err(dev, "failed to devm_request_and_ioremap() region\n"); ret = PTR_ERR(wdt_base);
ret = -ENOMEM;
goto err; goto err;
} }
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h>
#include <asm/watchdog.h> #include <asm/watchdog.h>
#define DRV_NAME "sh-wdt" #define DRV_NAME "sh-wdt"
...@@ -249,9 +250,9 @@ static int sh_wdt_probe(struct platform_device *pdev) ...@@ -249,9 +250,9 @@ static int sh_wdt_probe(struct platform_device *pdev)
wdt->clk = NULL; wdt->clk = NULL;
} }
wdt->base = devm_request_and_ioremap(wdt->dev, res); wdt->base = devm_ioremap_resource(wdt->dev, res);
if (unlikely(!wdt->base)) { if (IS_ERR(wdt->base)) {
rc = -EADDRNOTAVAIL; rc = PTR_ERR(wdt->base);
goto err; goto err;
} }
......
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