Skip to contentSkip to conversation

sparc: indent an if statement

PATCH In review Dan Carpenter 2 participants 3 messages Nov 25, 2016

Subsystems (2)
Kernel janitors SPARC + UltraSPARC (sparc/sparc64)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 sparc: indent an if statement

The code works fine, but my static checker complains when we don't indent our if statements.

Signed-off-by Dan Carpenter <[email protected]>
arch/sparc/prom/ranges.c +1 -1
index 6d8dc2a..43f7d99 100644
@@ -43,7 +43,7 @@ static void prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1,
 			if (ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_child_space &&
 			   ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base &&
 			   ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U)
-			break;
+				break;
 		if (rng2c = nranges2) /* oops */
 			prom_printf("adjust_ranges: Could not find matching bus type...\n");
 		else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size)
#1 lore raw

Hi Dan.

Quoted 10 lines · Dan Carpenter

The code works fine, but my static checker complains when we don't indent our if statements.

Signed-off-by Dan Carpenter <[email protected]>
arch/sparc/prom/ranges.c +0 -0
index 6d8dc2a..43f7d99 100644

arch/sparc/prom/ranges.c static void prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1, · line 49

Quoted 8 lines
arch/sparc/prom/ranges.c +1 -1
@@ -43,7 +43,7 @@ static void prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1,
 			if (ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_child_space &&
 			   ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base &&
 			   ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U)
-			break;
+				break;
 		if (rng2c = nranges2) /* oops */
 			prom_printf("adjust_ranges: Could not find matching bus type...\n");
 		else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size)

This is one ugly looking function....
If we are anyway fixing indent thus increasign readability, then how about doing just a little more.
Like this untested patch.

I do not claim it is readable, but it is an improvement.

Sam

arch/sparc/prom/ranges.c +15 -9
index 6d8dc2a..271d62d 100644
@@ -37,19 +37,25 @@ static void prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1,
 			       struct linux_prom_ranges *ranges2, int nranges2)
 {
 	int rng1c, rng2c;
+	struct linux_prom_ranges **rng1;
+	struct linux_prom_ranges **rng2;
 
 	for (rng1c = 0; rng1c < nranges1; rng1c++) {
-		for (rng2c = 0; rng2c < nranges2; rng2c++)
-			if (ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_child_space &&
-			   ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base &&
-			   ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U)
-			break;
+		rng1 = &ranges1[rng1c];
+		rng2 = &ranges2[0];
+		for (rng2c = 0; rng2c < nranges2; rng2c++) {
+			rng2 = &ranges2[rng2c];
+			if (rng1->ot_parent_space = rng2->ot_child_space &&
+			    rng1->ot_parent_base >= rng2->ot_child_base &&
+			    rng2->ot_child_base + rng2->or_size - rng1->ot_parent_base > 0U)
+				break;
+		}
 		if (rng2c = nranges2) /* oops */
 			prom_printf("adjust_ranges: Could not find matching bus type...\n");
-		else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size)
-			ranges1[rng1c].or_size = ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base;
-		ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_parent_space;
-		ranges1[rng1c].ot_parent_base += ranges2[rng2c].ot_parent_base;
+		else if (rng1->ot_parent_base + rng1->or_size > rng2->ot_child_base + rng2->or_size)
+			rng1->or_size = rng2->ot_child_base + rng2->or_size - rng1->ot_parent_base;
+		rng1->ot_parent_space = rng2->ot_parent_space;
+		rng1->ot_parent_base += rng2->ot_parent_base;
 	}
 }