From: Marek Vasut <marex@denx.de>
Date: Mon, 20 Jul 2015 06:09:05 +0000 (+0200)
Subject: ddr: altera: Clean up set_rank_and_odt_mask() part 2
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=287cdf6be748ca2600ba09c3363732fd66981e9a;p=u-boot.git

ddr: altera: Clean up set_rank_and_odt_mask() part 2

Turn the big inner if (RW_MGR_MEM_NUMBER_OF_RANKS == ...) conditional
into a switch {} statement instead. No functional change.

Signed-off-by: Marek Vasut <marex@denx.de>
---

diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 7dd9a66cc9..f7b5f526c5 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -164,16 +164,13 @@ static void set_rank_and_odt_mask(const u32 rank, const u32 odt_mode)
 		odt_mask_0 = 0x0;
 		odt_mask_1 = 0x0;
 	} else {	/* RW_MGR_ODT_MODE_READ_WRITE */
-		if (RW_MGR_MEM_NUMBER_OF_RANKS == 1) {
-			/*
-			 * 1 Rank
-			 * Read: ODT = 0
-			 * Write: ODT = 1
-			 */
+		switch (RW_MGR_MEM_NUMBER_OF_RANKS) {
+		case 1:	/* 1 Rank */
+			/* Read: ODT = 0 ; Write: ODT = 1 */
 			odt_mask_0 = 0x0;
 			odt_mask_1 = 0x1;
-		} else if (RW_MGR_MEM_NUMBER_OF_RANKS == 2) {
-			/* 2 Ranks */
+			break;
+		case 2:	/* 2 Ranks */
 			if (RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM == 1) {
 				/* - Dual-Slot , Single-Rank
 				 * (1 chip-select per DIMM)
@@ -198,9 +195,9 @@ static void set_rank_and_odt_mask(const u32 rank, const u32 odt_mode)
 				odt_mask_0 = 0x0;
 				odt_mask_1 = 0x3 & (1 << rank);
 			}
-		} else {
-			/* 4 Ranks
-			 * Read:
+			break;
+		case 4:	/* 4 Ranks */
+			/* Read:
 			 * ----------+-----------------------+
 			 *           |                       |
 			 *           |         ODT           |
@@ -244,6 +241,7 @@ static void set_rank_and_odt_mask(const u32 rank, const u32 odt_mode)
 				odt_mask_1 = 0xA;
 				break;
 			}
+			break;
 		}
 	}