Commit f29521e4 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar

x86: rename mp_config_table to mpc_table

Impact: cleanup, solve 80 columns wrap problems

mp_config_table should be renamed to mpc_table.
The reason: the 'c' in MPC already means 'config' -
no need to repeat that in the type name.
Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 923a789b
...@@ -10,8 +10,7 @@ extern void setup_unisys(void); ...@@ -10,8 +10,7 @@ extern void setup_unisys(void);
#ifndef CONFIG_X86_GENERICARCH #ifndef CONFIG_X86_GENERICARCH
extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
extern int mps_oem_check(struct mp_config_table *mpc, char *oem, extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid);
char *productid);
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
struct mpc_config_bus; struct mpc_config_bus;
struct mp_config_table; struct mpc_table;
struct mpc_config_processor; struct mpc_config_processor;
struct genapic { struct genapic {
...@@ -51,7 +51,7 @@ struct genapic { ...@@ -51,7 +51,7 @@ struct genapic {
/* When one of the next two hooks returns 1 the genapic /* When one of the next two hooks returns 1 the genapic
is switched to this. Essentially they are additional probe is switched to this. Essentially they are additional probe
functions. */ functions. */
int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, int (*mps_oem_check)(struct mpc_table *mpc, char *oem,
char *productid); char *productid);
int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);
......
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H #ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H #define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, static inline int
char *productid) mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{ {
return 0; return 0;
} }
......
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H #define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
extern int mps_oem_check(struct mp_config_table *mpc, char *oem, extern int mps_oem_check(struct mpc_table *, char *, char *);
char *productid);
extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); extern int acpi_madt_oem_check(char *, char *);
#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */ #endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */ /* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */
#define MAX_MP_BUSSES 260 #define MAX_MP_BUSSES 260
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);
char *productid);
#endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */ #endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */
...@@ -39,7 +39,7 @@ struct intel_mp_floating { ...@@ -39,7 +39,7 @@ struct intel_mp_floating {
#define MPC_SIGNATURE "PCMP" #define MPC_SIGNATURE "PCMP"
struct mp_config_table { struct mpc_table {
char mpc_signature[4]; char mpc_signature[4];
unsigned short mpc_length; /* Size of table */ unsigned short mpc_length; /* Size of table */
char mpc_spec; /* 0x01 */ char mpc_spec; /* 0x01 */
......
#ifndef __ASM_NUMAQ_MPPARSE_H #ifndef __ASM_NUMAQ_MPPARSE_H
#define __ASM_NUMAQ_MPPARSE_H #define __ASM_NUMAQ_MPPARSE_H
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);
char *productid);
#endif /* __ASM_NUMAQ_MPPARSE_H */ #endif /* __ASM_NUMAQ_MPPARSE_H */
...@@ -11,7 +11,7 @@ extern void setup_summit(void); ...@@ -11,7 +11,7 @@ extern void setup_summit(void);
#define setup_summit() {} #define setup_summit() {}
#endif #endif
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, static inline int mps_oem_check(struct mpc_table *mpc, char *oem,
char *productid) char *productid)
{ {
if (!strncmp(oem, "IBM ENSW", 8) && if (!strncmp(oem, "IBM ENSW", 8) &&
......
...@@ -246,8 +246,7 @@ static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m) ...@@ -246,8 +246,7 @@ static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m)
* Read/parse the MPC * Read/parse the MPC
*/ */
static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem, static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str)
char *str)
{ {
if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) { if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) {
...@@ -283,7 +282,7 @@ static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem, ...@@ -283,7 +282,7 @@ static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem,
return 1; return 1;
} }
static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early) static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
{ {
char str[16]; char str[16];
char oem[10]; char oem[10];
...@@ -843,7 +842,7 @@ static int __init get_MP_intsrc_index(struct mpc_config_intsrc *m) ...@@ -843,7 +842,7 @@ static int __init get_MP_intsrc_index(struct mpc_config_intsrc *m)
static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM]; static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM];
#endif #endif
static int __init replace_intsrc_all(struct mp_config_table *mpc, static int __init replace_intsrc_all(struct mpc_table *mpc,
unsigned long mpc_new_phys, unsigned long mpc_new_phys,
unsigned long mpc_new_length) unsigned long mpc_new_length)
{ {
...@@ -1014,8 +1013,7 @@ static int __init update_mp_table(void) ...@@ -1014,8 +1013,7 @@ static int __init update_mp_table(void)
char str[16]; char str[16];
char oem[10]; char oem[10];
struct intel_mp_floating *mpf; struct intel_mp_floating *mpf;
struct mp_config_table *mpc; struct mpc_table *mpc, *mpc_new;
struct mp_config_table *mpc_new;
if (!enable_update_mptable) if (!enable_update_mptable)
return 0; return 0;
......
...@@ -260,8 +260,7 @@ static struct x86_quirks numaq_x86_quirks __initdata = { ...@@ -260,8 +260,7 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
.update_genapic = numaq_update_genapic, .update_genapic = numaq_update_genapic,
}; };
void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, void numaq_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
char *productid)
{ {
if (strncmp(oem, "IBM NUMA", 8)) if (strncmp(oem, "IBM NUMA", 8))
printk("Warning! Not a NUMA-Q system!\n"); printk("Warning! Not a NUMA-Q system!\n");
......
...@@ -43,8 +43,8 @@ static void __init enable_apic_mode(void) ...@@ -43,8 +43,8 @@ static void __init enable_apic_mode(void)
return; return;
} }
static __init int mps_oem_check(struct mp_config_table *mpc, char *oem, static __init int
char *productid) mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{ {
if (mpc->mpc_oemptr) { if (mpc->mpc_oemptr) {
struct mp_config_oemtable *oem_table = struct mp_config_oemtable *oem_table =
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
#include <asm/numaq/wakecpu.h> #include <asm/numaq/wakecpu.h>
#include <asm/numaq.h> #include <asm/numaq.h>
static int mps_oem_check(struct mp_config_table *mpc, char *oem, static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
char *productid)
{ {
numaq_mps_oem_check(mpc, oem, productid); numaq_mps_oem_check(mpc, oem, productid);
return found_numaq; return found_numaq;
......
...@@ -110,8 +110,7 @@ void __init generic_apic_probe(void) ...@@ -110,8 +110,7 @@ void __init generic_apic_probe(void)
/* These functions can switch the APIC even after the initial ->probe() */ /* These functions can switch the APIC even after the initial ->probe() */
int __init mps_oem_check(struct mp_config_table *mpc, char *oem, int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
char *productid)
{ {
int i; int i;
for (i = 0; apic_probe[i]; ++i) { for (i = 0; apic_probe[i]; ++i) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment