diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-04 09:06:41 +0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2013-05-09 10:12:00 +0400 |
| commit | 6330c7070be6783b82025d2bc259db8413c00182 (patch) | |
| tree | 32ef8ae643db47f6c8176b15ae22094b58fefa8c /drivers/watchdog/s3c2410_wdt.c | |
| parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
| download | linux-6330c7070be6783b82025d2bc259db8413c00182.tar.xz | |
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/s3c2410_wdt.c')
| -rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index c1a221cbeae4..ee03135f5abd 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -330,10 +330,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev) } /* get the memory region for the watchdog timer */ - wdt_base = devm_request_and_ioremap(dev, wdt_mem); - if (wdt_base == NULL) { - dev_err(dev, "failed to devm_request_and_ioremap() region\n"); - ret = -ENOMEM; + wdt_base = devm_ioremap_resource(dev, wdt_mem); + if (IS_ERR(wdt_base)) { + ret = PTR_ERR(wdt_base); goto err; } |