From: Marek Vasut Date: Fri, 17 Jul 2015 01:44:26 +0000 (+0200) Subject: ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 3 X-Git-Tag: v2015.10-rc2~288 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ac70d2f3873cea25b13d61e3442015696f27c597;p=oweals%2Fu-boot.git ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 3 This is kind of microseries-within-series indent cleanup. This patch just tweaks the indentation so it is visible what to do with the grp_calibrated variable. It is likely that this patch has checkpatch warnings, but for the sake of not breaking the code, these are ignored. No functional change. Signed-off-by: Marek Vasut --- diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 2f2b88b0a3..81c33071af 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -2235,8 +2235,8 @@ static uint32_t rw_mgr_mem_calibrate_vfifo(uint32_t read_group, /* * In RLDRAMX we may be messing the delay of pins in * the same write group but outside of the current read - * the group, but that's ok because we haven't - * calibrated output side yet. + * the group, but that's ok because we haven't calibrated + * output side yet. */ if (d > 0) { scc_mgr_apply_group_all_out_delay_add_all_ranks( @@ -2276,27 +2276,27 @@ static uint32_t rw_mgr_mem_calibrate_vfifo(uint32_t read_group, * per shadow register basis. */ for (rank_bgn = 0, sr = 0; - rank_bgn < RW_MGR_MEM_NUMBER_OF_RANKS; - rank_bgn += NUM_RANKS_PER_SHADOW_REG, - ++sr) { + rank_bgn < RW_MGR_MEM_NUMBER_OF_RANKS; + rank_bgn += NUM_RANKS_PER_SHADOW_REG, sr++) { /* * Determine if this set of ranks * should be skipped entirely. */ - if (!param->skip_shadow_regs[sr]) { - /* - * If doing read after write - * calibration, do not update - * FOM, now - do it then. - */ - if (!rw_mgr_mem_calibrate_vfifo_center - (rank_bgn, write_group, - read_group, test_bgn, - 1, 0)) { - grp_calibrated = 0; - failed_substage = CAL_SUBSTAGE_VFIFO_CENTER; - } - } + if (param->skip_shadow_regs[sr]) + continue; + /* + * If doing read after write + * calibration, do not update + * FOM, now - do it then. + */ + if (rw_mgr_mem_calibrate_vfifo_center + (rank_bgn, write_group, + read_group, test_bgn, + 1, 0)) + continue; + + grp_calibrated = 0; + failed_substage = CAL_SUBSTAGE_VFIFO_CENTER; } } else { grp_calibrated = 0;