]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
pinctrl: st: Convert to use devm_ioremap_resource
authorSachin Kamat <sachin.kamat@linaro.org>
Mon, 29 Jul 2013 04:22:55 +0000 (09:52 +0530)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 7 Aug 2013 20:29:57 +0000 (22:29 +0200)
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>
drivers/pinctrl/pinctrl-st.c

index 04d4506ae18d963d898fcfb54737a4776c1bb2e3..6246d7a41b150041a28b78e7296c7442b6ca70d8 100644 (file)
@@ -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;