1 files changed, 3 insertions, 6 deletions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index cea02d703bca..5013a48d1aff 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
         /* Athlon 660/661 is valid. */
         if ((c->x86_model == 6) && ((c->x86_mask == 0) ||
             (c->x86_mask == 1)))
-                goto valid_k7;
+                return;
 
         /* Duron 670 is valid */
         if ((c->x86_model == 7) && (c->x86_mask == 0))
-                goto valid_k7;
+                return;
 
         /*
          * Athlon 662, Duron 671, and Athlon >model 7 have capability
@@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
             ((c->x86_model == 7) && (c->x86_mask >= 1)) ||
              (c->x86_model > 7))
                 if (cpu_has_mp)
-                        goto valid_k7;
+                        return;
 
         /* If we get here, not a certified SMP capable AMD system. */
 
@@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
         WARN_ONCE(1, "WARNING: This combination of AMD"
                 " processors is not suitable for SMP.\n");
         add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE);
-
-valid_k7:
-        ;
 }
 
 static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)