Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / watchdog / sp805_wdt.c

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 3f786ce0a6f2ae93fbb788f7b5dbfc1a06efeac5..47629d268e0a674a74899a8c620dc128476508ea 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -16,7 +16,6 @@
 #include <linux/amba/bus.h>
 #include <linux/bitops.h>
 #include <linux/clk.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
@@ -209,27 +208,15 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
        struct sp805_wdt *wdt;
        int ret = 0;
 
-       if (!devm_request_mem_region(&adev->dev, adev->res.start,
-                               resource_size(&adev->res), "sp805_wdt")) {
-               dev_warn(&adev->dev, "Failed to get memory region resource\n");
-               ret = -ENOENT;
-               goto err;
-       }
-
        wdt = devm_kzalloc(&adev->dev, sizeof(*wdt), GFP_KERNEL);
        if (!wdt) {
-               dev_warn(&adev->dev, "Kzalloc failed\n");
                ret = -ENOMEM;
                goto err;
        }
 
-       wdt->base = devm_ioremap(&adev->dev, adev->res.start,
-                       resource_size(&adev->res));
-       if (!wdt->base) {
-               ret = -ENOMEM;
-               dev_warn(&adev->dev, "ioremap fail\n");
-               goto err;
-       }
+       wdt->base = devm_ioremap_resource(&adev->dev, &adev->res);
+       if (IS_ERR(wdt->base))
+               return PTR_ERR(wdt->base);
 
        wdt->clk = devm_clk_get(&adev->dev, NULL);
        if (IS_ERR(wdt->clk)) {