x86: rename mpc_config_bus to mpc_bus

Impact: cleanup, solve 80 columns wrap problems

mpc_config_bus should be renamed to mpc_bus.
The reason: the 'c' in MPC already means 'config' -
no need to repeat that in the type name.

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/include/asm/genapic_32.h b/arch/x86/include/asm/genapic_32.h
index db02be008f71..057e2c2360f2 100644
--- a/arch/x86/include/asm/genapic_32.h
+++ b/arch/x86/include/asm/genapic_32.h
@@ -15,7 +15,7 @@
  * Copyright 2003 Andi Kleen, SuSE Labs.
  */
 
-struct mpc_config_bus;
+struct mpc_bus;
 struct mpc_table;
 struct mpc_config_processor;
 
diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
index e260e6543b4c..daa3f4ab2ff3 100644
--- a/arch/x86/include/asm/mpspec_def.h
+++ b/arch/x86/include/asm/mpspec_def.h
@@ -80,7 +80,7 @@ struct mpc_config_processor {
         unsigned int mpc_reserved[2];
 };
 
-struct mpc_config_bus {
+struct mpc_bus {
         unsigned char mpc_type;
         unsigned char mpc_busid;
         unsigned char mpc_bustype[6];
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 4fcd53fd5f43..26754ca35a60 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -26,7 +26,7 @@ extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
  * Any setup quirks to be performed?
  */
 struct mpc_config_processor;
-struct mpc_config_bus;
+struct mpc_bus;
 struct mp_config_oemtable;
 struct x86_quirks {
         int (*arch_pre_time_init)(void);
@@ -40,8 +40,8 @@ struct x86_quirks {
 
         int *mpc_record;
         int (*mpc_apic_id)(struct mpc_config_processor *m);
-        void (*mpc_oem_bus_info)(struct mpc_config_bus *m, char *name);
-        void (*mpc_oem_pci_bus)(struct mpc_config_bus *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,
                                     unsigned short oemsize);
         int (*setup_ioapic_ids)(void);