Skip to contentSkip to conversation

arch/x86/kernel/cpu/cyrix.c: remove redundant code

PATCH New Daniele Forsi 1 participant 1 message Aug 2, 2014 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch/x86/kernel/cpu/cyrix.c: remove redundant code

This function doesn't read dir1 so it doesn't need to set a default value and code for case 3 and case 5 is identical so replace it with a "fall through" comment.

---
 arch/x86/kernel/cpu/cyrix.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/cyrix.c +2 -4
index aaf152e..6026664 100644
@@ -167,16 +167,14 @@ static void geode_configure(void)
 
 static void early_init_cyrix(struct cpuinfo_x86 *c)
 {
-	unsigned char dir0, dir0_msn, dir1 = 0;
+	unsigned char dir0, dir0_msn, dir1;
 
 	__do_cyrix_devid(&dir0, &dir1);
 	dir0_msn = dir0 >> 4; /* identifies CPU "family"   */
 
 	switch (dir0_msn) {
 	case 3: /* 6x86/6x86L */
-		/* Emulate MTRRs using Cyrix's ARRs. */
-		set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);
-		break;
+		/* Fall through */
 	case 5: /* 6x86MX/M II */
 		/* Emulate MTRRs using Cyrix's ARRs. */
 		set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);
Signature · 1 line
2.0.1