x86: rename mpc_config_oemtable to mpc_oemtable
PATCH 7/7 x86: rename mpc_config_oemtable to mpc_oemtable
Impact: cleanup, smaller names, solves 80 columns wrap problem
mpc_config_oemtable should be renamed to mpc_oemtable. The reason: the 'c' in MPC already means 'config' - no need to repeat that in the type name.
Signed-off-by Jaswinder Singh Rajput <[email protected]>
--- arch/x86/include/asm/mpspec_def.h | 2 +- arch/x86/include/asm/setup.h | 4 ++-- arch/x86/kernel/mpparse.c | 2 +- arch/x86/kernel/numaq_32.c | 2 +- arch/x86/mach-generic/es7000.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/mpspec_def.h +1 -1
@@ -151,7 +151,7 @@ struct mpc_lintsrc {#define MPC_OEM_SIGNATURE "_OEM" -struct mp_config_oemtable { +struct mpc_oemtable {char oem_signature[4 ];unsigned short oem_length;/* Size of table */ char oem_rev;/* 0x01 */
arch/x86/include/asm/setup.h +2 -2
@@ -27,7 +27,7 @@ extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);*/ struct mpc_cpu ;struct mpc_bus ; -struct mp_config_oemtable ; +struct mpc_oemtable ;struct x86_quirks {int (*arch_pre_time_init)(void );int (*arch_time_init)(void );
@@ -42,7 +42,7 @@ struct x86_quirks {int (*mpc_apic_id)(struct mpc_cpu *m);void (*mpc_oem_bus_info)(struct mpc_bus *m,char *name);void (*mpc_oem_pci_bus)(struct mpc_bus *m); -void (*smp_read_mpc_oem)(struct mp_config_oemtable *oemtable, +void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable,unsigned short oemsize);int (*setup_ioapic_ids)(void );int (*update_genapic)(void );
arch/x86/kernel/mpparse.c +1 -1
@@ -313,7 +313,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)return 1 ;if (mpc->mpc_oemptr && x86_quirks->smp_read_mpc_oem) { -struct mp_config_oemtable *oem_table = (struct mp_config_oemtable *)(unsigned long )mpc->mpc_oemptr; +struct mpc_oemtable *oem_table = (void *)(long )mpc->mpc_oemptr; x86_quirks->smp_read_mpc_oem (oem_table, mpc->mpc_oemsize); }
arch/x86/kernel/numaq_32.c +1 -1
@@ -186,7 +186,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)* Read/parse the MPC oem tables */ -static void __init smp_read_mpc_oem (struct mp_config_oemtable *oemtable, +static void __init smp_read_mpc_oem (struct mpc_oemtable *oemtable,unsigned short oemsize) {int count =sizeof (*oemtable);/* the header size */
arch/x86/mach-generic/es7000.c +2 -2
@@ -47,8 +47,8 @@ static __init int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) { if (mpc->mpc_oemptr) { - struct mp_config_oemtable *oem_table = - (struct mp_config_oemtable *)mpc->mpc_oemptr; + struct mpc_oemtable *oem_table = + (struct mpc_oemtable *)mpc->mpc_oemptr;if (!strncmp (oem,"UNISYS" ,6 ))return parse_unisys_oem ((char *)oem_table); }
Signature · 1 line
1.5.5.1