memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()

PATCH In review Axel Lin 2 participants 3 messages Sep 20, 2012

Subsystems (2)

Tegra architecture support Memory controller drivers

lore

Share & tools

lore

Axel Lin

author

2012-09-20 01:33 UTC #0 lore raw

PATCH 1/1 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()

The code reading the register does not match the code writing to the register, fix it.

Also fix the coding style in mc_writel() for better readability.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/memory/tegra20-mc.c |   10 +++-------
 drivers/memory/tegra30-mc.c |   22 +++++++---------------
 2 files changed, 10 insertions(+), 22 deletions(-)

drivers/memory/tegra20-mc.c +3 -7

index 3ed49c1..e6764bb 100644
@@ -57,7 +57,7 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
 
 	if (offs < 0x24)
 		val = readl(mc->regs[0] + offs);
-	if (offs < 0x400)
+	else if (offs < 0x400)
 		val = readl(mc->regs[1] + offs - 0x3c);
 
 	return val;

@@ -65,14 +65,10 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
 
 static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
 {
-	if (offs < 0x24) {
+	if (offs < 0x24)
 		writel(val, mc->regs[0] + offs);
-		return;
-	}
-	if (offs < 0x400) {
+	else if (offs < 0x400)
 		writel(val, mc->regs[1] + offs - 0x3c);
-		return;
-	}
 }
 
 static const char * const tegra20_mc_client[] = {

drivers/memory/tegra30-mc.c +7 ~~-15~~

index e56ff04..802b9ea 100644
@@ -95,11 +95,11 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
 
 	if (offs < 0x10)
 		val = readl(mc->regs[0] + offs);
-	if (offs < 0x1f0)
+	else if (offs < 0x1f0)
 		val = readl(mc->regs[1] + offs - 0x3c);
-	if (offs < 0x228)
+	else if (offs < 0x228)
 		val = readl(mc->regs[2] + offs - 0x200);
-	if (offs < 0x400)
+	else if (offs < 0x400)
 		val = readl(mc->regs[3] + offs - 0x284);
 
 	return val;

@@ -107,22 +107,14 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
 
 static inline void mc_writel(struct tegra30_mc *mc, u32 val, u32 offs)
 {
-	if (offs < 0x10) {
+	if (offs < 0x10)
 		writel(val, mc->regs[0] + offs);
-		return;
-	}
-	if (offs < 0x1f0) {
+	else if (offs < 0x1f0)
 		writel(val, mc->regs[1] + offs - 0x3c);
-		return;
-	}
-	if (offs < 0x228) {
+	else if (offs < 0x228)
 		writel(val, mc->regs[2] + offs - 0x200);
-		return;
-	}
-	if (offs < 0x400) {
+	else if (offs < 0x400)
 		writel(val, mc->regs[3] + offs - 0x284);
-		return;
-	}
 }
 
 static const char * const tegra30_mc_client[] = {

Signature · 1 line

1.7.9.5

Stephen Warren

Acked-by Tested-by on v1 1/1

2012-09-20 18:28 UTC #1 lore raw

Quoted 4 lines · Axel Lin

The code reading the register does not match the code writing to the register, fix it.
Also fix the coding style in mc_writel() for better readability.

I assume RFT==Request For Test? I haven't seen that before. Anyway,

Acked-by Stephen Warren <[email protected]>

Tested-by Stephen Warren <[email protected]>

Axel Lin

author

2012-09-20 22:13 UTC #2 lore raw

2012/9/21 Stephen Warren <[email protected]>:

Quoted 7 lines · Axel Lin

Quoted 4 lines
The code reading the register does not match the code writing to the register, fix it.
Also fix the coding style in mc_writel() for better readability.
I assume RFT==Request For Test? I haven't seen that before. Anyway,

Yes, it means "Request For Test" because I don't have a tegra platform handy.

Quoted 3 lines

Acked-by Stephen Warren <[email protected]>
Tested-by Stephen Warren <[email protected]>

Thanks for the review and testing.

Axel