Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / watchdog / at32ap700x_wdt.c

diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index 7a715e3e6828ee2ede8b80676860d3fc6d280e22..b178e717ef09e025b6984b00b68184e05934f8e8 100644 (file)
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -321,13 +321,14 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       wdt = kzalloc(sizeof(struct wdt_at32ap700x), GFP_KERNEL);
+       wdt = devm_kzalloc(&pdev->dev, sizeof(struct wdt_at32ap700x),
+                       GFP_KERNEL);
        if (!wdt) {
                dev_dbg(&pdev->dev, "no memory for wdt structure\n");
                return -ENOMEM;
        }
 
-       wdt->regs = ioremap(regs->start, resource_size(regs));
+       wdt->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
        if (!wdt->regs) {
                ret = -ENOMEM;
                dev_dbg(&pdev->dev, "could not map I/O memory\n");
@@ -342,7 +343,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
                dev_info(&pdev->dev, "CPU must be reset with external "
                                "reset or POR due to silicon errata.\n");
                ret = -EIO;
-               goto err_iounmap;
+               goto err_free;
        } else {
                wdt->users = 0;
        }
@@ -364,7 +365,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
        ret = misc_register(&wdt->miscdev);
        if (ret) {
                dev_dbg(&pdev->dev, "failed to register wdt miscdev\n");
-               goto err_register;
+               goto err_free;
        }
 
        dev_info(&pdev->dev,
@@ -373,12 +374,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
 
        return 0;
 
-err_register:
-       platform_set_drvdata(pdev, NULL);
-err_iounmap:
-       iounmap(wdt->regs);
 err_free:
-       kfree(wdt);
        wdt = NULL;
        return ret;
 }
@@ -391,10 +387,7 @@ static int __exit at32_wdt_remove(struct platform_device *pdev)
                        at32_wdt_stop();
 
                misc_deregister(&wdt->miscdev);
-               iounmap(wdt->regs);
-               kfree(wdt);
                wdt = NULL;
-               platform_set_drvdata(pdev, NULL);
        }
        return 0;
 }