[PATCH v1 2/2] x86: tangier: pinmux: Move error message to the caller

[Simon Glass]

On Wed, 27 Oct 2021 at 08:23, Andy Shevchenko
<andriy.shevchenko at linux.intel.com> wrote:
>
> Move error message to the caller of mrfld_pinconfig*() in order
> to unify them in the future.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> ---
>  arch/x86/cpu/tangier/pinmux.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>

>
> diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
> index 883860f75e28..7b2c35fbf794 100644
> --- a/arch/x86/cpu/tangier/pinmux.c
> +++ b/arch/x86/cpu/tangier/pinmux.c
> @@ -117,13 +117,7 @@ static int mrfld_pinconfig_protected(unsigned int pin, u32 mask, u32 bits)
>         debug("scu: v: 0x%x p: 0x%x bits: %d, mask: %d bufcfg: 0x%p\n",
>               v, (u32)bufcfg, bits, mask, bufcfg);
>
> -       ret = scu_ipc_raw_command(IPCMSG_INDIRECT_WRITE, 0, &v, 4,
> -                                 NULL, 0, (u32)bufcfg, 0);
> -       if (ret)
> -               pr_err("Failed to set mode via SCU for pin %u (%d)\n",
> -                      pin, ret);
> -
> -       return ret;
> +       return scu_ipc_raw_command(IPCMSG_INDIRECT_WRITE, 0, &v, 4, NULL, 0, (u32)bufcfg, 0);

In general I like to separate out the error return so we can use something like:

ret = scu_...
if (ret)
   return log_msg_ret("scu", ret);

return 0;


>  }
>
>  static int mrfld_pinconfig(unsigned int pin, u32 mask, u32 bits)
> @@ -181,6 +175,8 @@ static int mrfld_pinctrl_cfg_pin(ofnode pin_node)
>                 ret = mrfld_pinconfig_protected(pad_offset, mask, mode);
>         else
>                 ret = mrfld_pinconfig(pad_offset, mask, mode);
> +       if (ret)
> +               pr_err("Failed to set mode for pin %u (%d)\n", pad_offset, ret);
>
>         return ret;
>  }
> --
> 2.33.0
>