x86/mce/amd: Remove return value for mce_threshold_{create,remove}_device()

The return values are not checked, so set return type to 'void'.

Also, move function declarations to internal.h, since these functions are
only used within the MCE subsystem.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Link: https://lore.kernel.org/20250624-wip-mca-updates-v4-6-236dd74f645f@amd.com

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 6c77c03139f7fa6b8cf902a41831071a9201a5dd..752802bf966b9ca726e6bcc3e509b6eca589df2e 100644 (file)
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -371,15 +371,9 @@ enum smca_bank_types {
 
 extern bool amd_mce_is_memory_error(struct mce *m);
 
-extern int mce_threshold_create_device(unsigned int cpu);
-extern int mce_threshold_remove_device(unsigned int cpu);
-
 void mce_amd_feature_init(struct cpuinfo_x86 *c);
 enum smca_bank_types smca_get_bank_type(unsigned int cpu, unsigned int bank);
 #else
-
-static inline int mce_threshold_create_device(unsigned int cpu)                { return 0; };
-static inline int mce_threshold_remove_device(unsigned int cpu)                { return 0; };
 static inline bool amd_mce_is_memory_error(struct mce *m)              { return false; };
 static inline void mce_amd_feature_init(struct cpuinfo_x86 *c)         { }
 #endif

diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 9b980aecb6b3de9341d3e4e24269e53ee7306616..f429451cafc8f177140a3041a49b4fdb4951d57e 100644 (file)
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -1296,12 +1296,12 @@ static void __threshold_remove_device(struct threshold_bank **bp)
        kfree(bp);
 }
 
-int mce_threshold_remove_device(unsigned int cpu)
+void mce_threshold_remove_device(unsigned int cpu)
 {
        struct threshold_bank **bp = this_cpu_read(threshold_banks);
 
        if (!bp)
-               return 0;
+               return;
 
        /*
         * Clear the pointer before cleaning up, so that the interrupt won't
@@ -1310,7 +1310,7 @@ int mce_threshold_remove_device(unsigned int cpu)
        this_cpu_write(threshold_banks, NULL);
 
        __threshold_remove_device(bp);
-       return 0;
+       return;
 }
 
 /**
@@ -1324,36 +1324,34 @@ int mce_threshold_remove_device(unsigned int cpu)
  * thread running on @cpu.  The callback is invoked on all CPUs which are
  * online when the callback is installed or during a real hotplug event.
  */
-int mce_threshold_create_device(unsigned int cpu)
+void mce_threshold_create_device(unsigned int cpu)
 {
        unsigned int numbanks, bank;
        struct threshold_bank **bp;
-       int err;
 
        if (!mce_flags.amd_threshold)
-               return 0;
+               return;
 
        bp = this_cpu_read(threshold_banks);
        if (bp)
-               return 0;
+               return;
 
        numbanks = this_cpu_read(mce_num_banks);
        bp = kcalloc(numbanks, sizeof(*bp), GFP_KERNEL);
        if (!bp)
-               return -ENOMEM;
+               return;
 
        for (bank = 0; bank < numbanks; ++bank) {
                if (!(this_cpu_read(bank_map) & BIT_ULL(bank)))
                        continue;
-               err = threshold_create_bank(bp, cpu, bank);
-               if (err) {
+               if (threshold_create_bank(bp, cpu, bank)) {
                        __threshold_remove_device(bp);
-                       return err;
+                       return;
                }
        }
        this_cpu_write(threshold_banks, bp);
 
        if (thresholding_irq_en)
                mce_threshold_vector = amd_threshold_interrupt;
-       return 0;
+       return;
 }

diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h
index b5ba598e54cb48dca1f4e215bcfaf24b7d6b2408..64ac25b953603bef5a723879fedd0697c05b5f54 100644 (file)
--- a/arch/x86/kernel/cpu/mce/internal.h
+++ b/arch/x86/kernel/cpu/mce/internal.h
@@ -265,6 +265,8 @@ void mce_prep_record_common(struct mce *m);
 void mce_prep_record_per_cpu(unsigned int cpu, struct mce *m);
 
 #ifdef CONFIG_X86_MCE_AMD
+void mce_threshold_create_device(unsigned int cpu);
+void mce_threshold_remove_device(unsigned int cpu);
 extern bool amd_filter_mce(struct mce *m);
 bool amd_mce_usable_address(struct mce *m);
 
@@ -293,6 +295,8 @@ static __always_inline void smca_extract_err_addr(struct mce *m)
 }
 
 #else
+static inline void mce_threshold_create_device(unsigned int cpu)       { }
+static inline void mce_threshold_remove_device(unsigned int cpu)       { }
 static inline bool amd_filter_mce(struct mce *m) { return false; }
 static inline bool amd_mce_usable_address(struct mce *m) { return false; }
 static inline void smca_extract_err_addr(struct mce *m) { }