x86: tangier: pinmux: Move error message to the caller

Move error message to the caller of mrfld_pinconfig*() in order
to unify them in the future.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 883860f75e283f9f3e5a7aa648776bd420b8971a..7b2c35fbf794714e3f539da0cf6e3f49479a1665 100644 (file)
--- 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);
 }
 
 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;
 }