[PATCH] pinctrl: at91: simplify probe error handling

[PATCH] pinctrl: at91: simplify probe error handling

[Baruch Siach]

There is no code ender the 'err' label. Just return the error code directly.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 drivers/pinctrl/pinctrl-at91.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index f4cd0b9b2438..6cfe534ab27e 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -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)
-- 
2.1.4

Re: [PATCH] pinctrl: at91: simplify probe error handling

[Alexandre Belloni]

On 02/03/2015 at 19:28:45 +0200, Baruch Siach wrote :
> 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>

> ---
>  drivers/pinctrl/pinctrl-at91.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index f4cd0b9b2438..6cfe534ab27e 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -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)
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH] pinctrl: at91: simplify probe error handling

[Ludovic Desroches]

On Mon, Mar 02, 2015 at 07:28:45PM +0200, Baruch Siach wrote:
> There is no code ender the 'err' label. Just return the error code directly.
>

Probably a remainder of pre managed resources time.

> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>

> ---
>  drivers/pinctrl/pinctrl-at91.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index f4cd0b9b2438..6cfe534ab27e 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -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)
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] pinctrl: at91: simplify probe error handling

[Linus Walleij]

On Mon, Mar 2, 2015 at 6:28 PM, Baruch Siach <baruch@tkos.co.il> wrote:

> There is no code ender the 'err' label. Just return the error code directly.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Patch applied with the ACKs.

Yours,
Linus Walleij