From: Frieder Schrempf <[email protected]> Move the error message from wait_ddrphy_training_complete() to the calling site in ddr_cfg_phy(). This is more robust to future changes in wait_ddrphy_training_complete() and allows us to make the message optional.
Signed-off-by: Frieder Schrempf <[email protected]> --- drivers/ddr/imx/phy/ddrphy_train.c | 4 +++- drivers/ddr/imx/phy/ddrphy_utils.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ddr/imx/phy/ddrphy_train.c b/drivers/ddr/imx/phy/ddrphy_train.c index 63a6ca800a3..68468610fd6 100644 --- a/drivers/ddr/imx/phy/ddrphy_train.c +++ b/drivers/ddr/imx/phy/ddrphy_train.c @@ -72,8 +72,10 @@ int ddr_cfg_phy(struct dram_timing_info *dram_timing) /* Wait for the training firmware to complete */ ret = wait_ddrphy_training_complete(); - if (ret) + if (ret) { + printf("Training FAILED\n"); return ret; + } /* Halt the microcontroller. */ dwc_ddrphy_apb_wr(0xd0099, 0x1); diff --git a/drivers/ddr/imx/phy/ddrphy_utils.c b/drivers/ddr/imx/phy/ddrphy_utils.c index 8e350de8315..8779db01607 100644 --- a/drivers/ddr/imx/phy/ddrphy_utils.c +++ b/drivers/ddr/imx/phy/ddrphy_utils.c @@ -97,7 +97,6 @@ int wait_ddrphy_training_complete(void) debug("Training PASS\n"); return 0; } else if (mail == 0xff) { - printf("Training FAILED\n"); return -1; } } -- 2.55.0
