x86, CPU, AMD: Drop useless label

All we want to do is return from this function so stop jumping around
like a flea for no good reason.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1365436666-9837-5-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index cea02d703bca2ff49d646630f0b614394eff0782..5013a48d1aff7a2f859a4d2e28224d1da4d95ea4 100644 (file)
--- 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)