x86/oprofile: simplify AMD cpu init code
authorRobert Richter <robert.richter@amd.com>
Sun, 11 Jan 2009 12:01:16 +0000 (13:01 +0100)
committerRobert Richter <robert.richter@amd.com>
Thu, 11 Jun 2009 17:41:50 +0000 (19:41 +0200)
Signed-off-by: Robert Richter <robert.richter@amd.com>
arch/x86/oprofile/nmi_int.c

index dd85153..ae0ab03 100644 (file)
@@ -460,27 +460,26 @@ int __init op_nmi_init(struct oprofile_operations *ops)
                /* Needs to be at least an Athlon (or hammer in 32bit mode) */
 
                switch (family) {
-               default:
-                       return -ENODEV;
                case 6:
-                       model = &op_amd_spec;
                        cpu_type = "i386/athlon";
                        break;
                case 0xf:
-                       model = &op_amd_spec;
-                       /* Actually it could be i386/hammer too, but give
-                        user space an consistent name. */
+                       /*
+                        * Actually it could be i386/hammer too, but
+                        * give user space an consistent name.
+                        */
                        cpu_type = "x86-64/hammer";
                        break;
                case 0x10:
-                       model = &op_amd_spec;
                        cpu_type = "x86-64/family10";
                        break;
                case 0x11:
-                       model = &op_amd_spec;
                        cpu_type = "x86-64/family11h";
                        break;
+               default:
+                       return -ENODEV;
                }
+               model = &op_amd_spec;
                break;
 
        case X86_VENDOR_INTEL: