gpio: Convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() 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: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index 85841ee70b17..c20e05151212 100644
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -214,11 +214,10 @@ static int xway_stp_probe(struct platform_device *pdev)
         if (!chip)
                 return -ENOMEM;
 
-        chip->virt = devm_request_and_ioremap(&pdev->dev, res);
-        if (!chip->virt) {
-                dev_err(&pdev->dev, "failed to remap STP memory\n");
-                return -ENOMEM;
-        }
+        chip->virt = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(chip->virt))
+                return PTR_ERR(chip->virt);
+        
         chip->gc.dev = &pdev->dev;
         chip->gc.label = "stp-xway";
         chip->gc.direction_output = xway_stp_dir_out;