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

From: Daniele Forsi
Date: Sat Aug 02 2014 - 10:44:43 EST


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.

Signed-off-by: Daniele Forsi <dforsi@xxxxxxxxx>
---
arch/x86/kernel/cpu/cyrix.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index aaf152e..6026664 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -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);
--
2.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/