pinctrl: at91: simplify probe error handling
authorBaruch Siach <baruch@tkos.co.il>
Mon, 2 Mar 2015 17:28:45 +0000 (19:28 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 9 Mar 2015 17:11:00 +0000 (18:11 +0100)
There is no code ender the 'err' label. Just return the error code directly.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-at91.c

index f4cd0b9b2438b3548fafa4746b6c6a6cf8874bb4..6cfe534ab27e31fda375b266b82061fccaa971a3 100644 (file)
@@ -1240,8 +1240,7 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
 
        if (!info->pctl) {
                dev_err(&pdev->dev, "could not register AT91 pinctrl driver\n");
-               ret = -EINVAL;
-               goto err;
+               return -EINVAL;
        }
 
        /* We will handle a range of GPIO pins */
@@ -1252,9 +1251,6 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
        dev_info(&pdev->dev, "initialized AT91 pinctrl driver\n");
 
        return 0;
-
-err:
-       return ret;
 }
 
 static int at91_pinctrl_remove(struct platform_device *pdev)