Re: [PATCH] trivial: pinctrl core: remove extraneous code lines

[Stephen Warren <swarren@xxxxxxxxxxxxx>]

On 08/10/2012 08:53 AM, Richard Genoud wrote:
> In function pinctrl_get_locked, pointer p is returned on error, and also
> return on no_error.
> So, we just return it with no error test.
> 
> It's pretty the same in function pinctrl_lookup_state_locked: state is
> returned in every case, so we drop the error test and just return state.
> 
> Signed-off-by: Richard Genoud <richard.genoud@xxxxxxxxx>
> ---
>  drivers/pinctrl/core.c |   10 ++--------
>  1 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
> index fb7f3be..7365d46 100644
> --- a/drivers/pinctrl/core.c
> +++ b/drivers/pinctrl/core.c
> @@ -657,11 +657,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev)
>  	if (p != NULL)
>  		return ERR_PTR(-EBUSY);
>  
> -	p = create_pinctrl(dev);
> -	if (IS_ERR(p))
> -		return p;
> -
> -	return p;
> +	return create_pinctrl(dev);
>  }

This makes sense.

>  /**
> @@ -738,10 +734,8 @@ static struct pinctrl_state *pinctrl_lookup_state_locked(struct pinctrl *p,
>  			dev_dbg(p->dev, "using pinctrl dummy state (%s)\n",
>  				name);
>  			state = create_state(p, name);
> -			if (IS_ERR(state))
> -				return state;
>  		} else {
> -			return ERR_PTR(-ENODEV);
> +			state = ERR_PTR(-ENODEV);
>  		}
>  	}

Personally I find the code much clearer as it is, but the result of this
patch still looks correct.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/