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>
This commit is contained in:

committed by
Wim Van Sebroeck

parent
e0fd9affeb
commit
6330c7070b
@@ -34,6 +34,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/err.h>
|
||||
#include <asm/watchdog.h>
|
||||
|
||||
#define DRV_NAME "sh-wdt"
|
||||
@@ -249,9 +250,9 @@ static int sh_wdt_probe(struct platform_device *pdev)
|
||||
wdt->clk = NULL;
|
||||
}
|
||||
|
||||
wdt->base = devm_request_and_ioremap(wdt->dev, res);
|
||||
if (unlikely(!wdt->base)) {
|
||||
rc = -EADDRNOTAVAIL;
|
||||
wdt->base = devm_ioremap_resource(wdt->dev, res);
|
||||
if (IS_ERR(wdt->base)) {
|
||||
rc = PTR_ERR(wdt->base);
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user