From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 29 Jul 2013 04:22:55 +0000 (+0530)
Subject: pinctrl: st: Convert to use devm_ioremap_resource
X-Git-Tag: firefly_0821_release~176^2~5439^2~64
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=656445f3e24d7dbae284c534004961357c976c93;p=firefly-linux-kernel-4.4.55.git

pinctrl: st: Convert to use devm_ioremap_resource

devm_request_and_ioremap is deprecated. Use devm_ioremap_resource
instead.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index 04d4506ae18d..6246d7a41b15 100644
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c
@@ -1222,11 +1222,9 @@ static int st_gpiolib_register_bank(struct st_pinctrl *info,
 	if (of_address_to_resource(np, 0, &res))
 		return -ENODEV;
 
-	bank->base = devm_request_and_ioremap(dev, &res);
-	if (!bank->base) {
-		dev_err(dev, "Can't get IO memory mapping!\n");
-		return -ENODEV;
-	}
+	bank->base = devm_ioremap_resource(dev, &res);
+	if (IS_ERR(bank->base))
+		return PTR_ERR(bank->base);
 
 	bank->gpio_chip = st_gpio_template;
 	bank->gpio_chip.base = bank_num * ST_GPIO_PINS_PER_BANK;