[PATCH] pinctrl: sirf: Use common error handling code in sirfsoc_dt_node_to_map()

[Geert Uytterhoeven]

Hi Markus,

On Mon, Oct 30, 2017 at 7:36 PM, SF Markus Elfring
<elfring at users.sourceforge.net> wrote:
> From: Markus Elfring <elfring at users.sourceforge.net>
> Date: Mon, 30 Oct 2017 19:26:56 +0100
>
> Add a jump target so that a bit of exception handling can be better reused
> at the end of this function.
>
> This issue was detected by using the Coccinelle software.

Does Coccinelle have a threshold for how much cleanup can be shared?

> Signed-off-by: Markus Elfring <elfring at users.sourceforge.net>
> ---
>  drivers/pinctrl/sirf/pinctrl-sirf.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)

Again, breaking the flow for the reviewer isn't worth it here, IMHO.

> diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
> index d64add0b84cc..5ec2f37f5180 100644
> --- a/drivers/pinctrl/sirf/pinctrl-sirf.c
> +++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
> @@ -89,16 +89,12 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev,
>         /* calculate number of maps required */
>         for_each_child_of_node(np_config, np) {
>                 ret = of_property_read_string(np, "sirf,function", &function);
> -               if (ret < 0) {
> -                       of_node_put(np);
> -                       return ret;
> -               }
> +               if (ret < 0)
> +                       goto put_node;
>
>                 ret = of_property_count_strings(np, "sirf,pins");
> -               if (ret < 0) {
> -                       of_node_put(np);
> -                       return ret;
> -               }
> +               if (ret < 0)
> +                       goto put_node;
>
>                 count += ret;
>         }
> @@ -125,6 +121,10 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev,
>         *num_maps = count;
>
>         return 0;
> +
> +put_node:
> +       of_node_put(np);
> +       return ret;
>  }

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds