1 files changed, 4 insertions, 16 deletions

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 9a45d0294cf4..ff908823688c 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -262,11 +262,9 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!imx2_wdt.base) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -ENOMEM;
-        }
+        imx2_wdt.base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(imx2_wdt.base))
+                return PTR_ERR(imx2_wdt.base);
 
         imx2_wdt.clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(imx2_wdt.clk)) {
@@ -342,17 +340,7 @@ static struct platform_driver imx2_wdt_driver = {
         },
 };
 
-static int __init imx2_wdt_init(void)
-{
-        return platform_driver_probe(&imx2_wdt_driver, imx2_wdt_probe);
-}
-module_init(imx2_wdt_init);
-
-static void __exit imx2_wdt_exit(void)
-{
-        platform_driver_unregister(&imx2_wdt_driver);
-}
-module_exit(imx2_wdt_exit);
+module_platform_driver_probe(imx2_wdt_driver, imx2_wdt_probe);
 
 MODULE_AUTHOR("Wolfram Sang");
 MODULE_DESCRIPTION("Watchdog driver for IMX2 and later");