diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-04 10:36:41 +0530 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2013-05-09 08:12:00 +0200 |
| commit | 6330c7070be6783b82025d2bc259db8413c00182 (patch) | |
| tree | 32ef8ae643db47f6c8176b15ae22094b58fefa8c /drivers/watchdog/davinci_wdt.c | |
| parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
| download | op-kernel-dev-6330c7070be6783b82025d2bc259db8413c00182.zip op-kernel-dev-6330c7070be6783b82025d2bc259db8413c00182.tar.gz | |
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: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/davinci_wdt.c')
| -rw-r--r-- | drivers/watchdog/davinci_wdt.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 7df1fdc..100d4fb 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -27,6 +27,7 @@ #include <linux/device.h> #include <linux/clk.h> #include <linux/slab.h> +#include <linux/err.h> #define MODULE_NAME "DAVINCI-WDT: " @@ -221,11 +222,9 @@ static int davinci_wdt_probe(struct platform_device *pdev) return -ENOENT; } - wdt_base = devm_request_and_ioremap(dev, wdt_mem); - if (!wdt_base) { - dev_err(dev, "ioremap failed\n"); - return -EADDRNOTAVAIL; - } + wdt_base = devm_ioremap_resource(dev, wdt_mem); + if (IS_ERR(wdt_base)) + return PTR_ERR(wdt_base); ret = misc_register(&davinci_wdt_miscdev); if (ret < 0) { |
