default_acpi_madt_oem_check() is just called when ACPI parse the MADT
table and doesn't return anything.
So make it void. also add identifier names for definition arguments.
Signed-off-by: Dou Liyang <[email protected]>
---
arch/x86/include/asm/apic.h | 2 +-
arch/x86/kernel/apic/probe_32.c | 5 ++---
arch/x86/kernel/apic/probe_64.c | 5 ++---
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index a9e57f0..34a24ac 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -492,7 +492,7 @@ static inline unsigned int read_apic_id(void)
}
extern int default_apic_id_valid(int apicid);
-extern int default_acpi_madt_oem_check(char *, char *);
+extern void default_acpi_madt_oem_check(char *oem_id, char *oem_table_id);
extern void default_setup_apic_routing(void);
extern u32 apic_default_calc_apicid(unsigned int cpu);
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index fa22017..60e42b4 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -228,7 +228,7 @@ void __init generic_apic_probe(void)
}
/* This function can switch the APIC even after the initial ->probe() */
-int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+void __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
struct apic **drv;
@@ -243,7 +243,6 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
printk(KERN_INFO "Switched to APIC driver `%s'.\n",
apic->name);
}
- return 1;
+ return;
}
- return 0;
}
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index c303054..a7a88f6 100644
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -53,7 +53,7 @@ void apic_send_IPI_self(int vector)
__default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
}
-int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+void __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
struct apic **drv;
@@ -64,8 +64,7 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
pr_info("Setting APIC routing to %s.\n",
apic->name);
}
- return 1;
+ return;
}
}
- return 0;
}
--
2.5.5
From 1584592620225021039@xxx Mon Nov 20 13:41:23 +0000 2017
X-GM-THRID: 1580851933359812646
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread