pinctrl: Convert to devm_ioremap_resource()

[karo-tx-linux.git] / drivers / pinctrl / pinctrl-xway.c

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index ad90984ec5008a7f39f64e6a498102af13cba583..ae8f3a02ed97c8428e7a13c7ba2e1894c7e6f5d8 100644 (file)
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -9,6 +9,7 @@
  *  Copyright (C) 2012 John Crispin <blogic@openwrt.org>
  */
 
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
@@ -674,7 +675,7 @@ static const struct of_device_id xway_match[] = {
 };
 MODULE_DEVICE_TABLE(of, xway_match);
 
-static int __devinit pinmux_xway_probe(struct platform_device *pdev)
+static int pinmux_xway_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match;
        const struct pinctrl_xway_soc *xway_soc;
@@ -687,11 +688,9 @@ static int __devinit pinmux_xway_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "Failed to get resource\n");
                return -ENOENT;
        }
-       xway_info.membase[0] = devm_request_and_ioremap(&pdev->dev, res);
-       if (!xway_info.membase[0]) {
-               dev_err(&pdev->dev, "Failed to remap resource\n");
-               return -ENOMEM;
-       }
+       xway_info.membase[0] = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(xway_info.membase[0]))
+               return PTR_ERR(xway_info.membase[0]);
 
        match = of_match_device(xway_match, &pdev->dev);
        if (match)