x86/oprofile: simplify AMD cpu init code

Signed-off-by: Robert Richter <robert.richter@amd.com>

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index dd85153..ae0ab03 100644 (file)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -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) {
                /* Needs to be at least an Athlon (or hammer in 32bit mode) */
 
                switch (family) {

-               default:
-                       return -ENODEV;

                case 6:
                case 6:

-                       model = &op_amd_spec;

                        cpu_type = "i386/athlon";
                        break;
                case 0xf:
                        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:
                        cpu_type = "x86-64/hammer";
                        break;
                case 0x10:

-                       model = &op_amd_spec;

                        cpu_type = "x86-64/family10";
                        break;
                case 0x11:
                        cpu_type = "x86-64/family10";
                        break;
                case 0x11:

-                       model = &op_amd_spec;

                        cpu_type = "x86-64/family11h";
                        break;
                        cpu_type = "x86-64/family11h";
                        break;

+               default:
+                       return -ENODEV;

                }
                }

+               model = &op_amd_spec;

                break;
 
        case X86_VENDOR_INTEL:
                break;
 
        case X86_VENDOR_INTEL: