x86: rename all fields of mpc_iopic mpc_X to X

Impact: cleanup, solve 80 columns wrap problems

It would be cleaner to rename all the mpc->mpc_X fields to
mpc->X - that alone would give 4 characters per usage site.
(we already know that it's an 'mpc' entity -
no need to duplicate that in the field too)

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

diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
index ba8ed0cf658d294d8a1b983e1038de39049d4e5e..f805682d80dcb181059b59d6b67409b34e5afcc8 100644 (file)
--- a/arch/x86/include/asm/mpspec_def.h
+++ b/arch/x86/include/asm/mpspec_def.h
@@ -109,11 +109,11 @@ struct mpc_bus {
 #define MPC_APIC_USABLE                0x01
 
 struct mpc_ioapic {
-       unsigned char mpc_type;
-       unsigned char mpc_apicid;
-       unsigned char mpc_apicver;
-       unsigned char mpc_flags;
-       unsigned int mpc_apicaddr;
+       unsigned char type;
+       unsigned char apicid;
+       unsigned char apicver;
+       unsigned char flags;
+       unsigned int apicaddr;
 };
 
 struct mpc_intsrc {

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 1ccb2537e3fdd328b3166fc132d409bf01bbaf45..f36d9daaf12c240c3bba96291c7b57773e898464 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -135,20 +135,20 @@ static int bad_ioapic(unsigned long address)
 
 static void __init MP_ioapic_info(struct mpc_ioapic *m)
 {
-       if (!(m->mpc_flags & MPC_APIC_USABLE))
+       if (!(m->flags & MPC_APIC_USABLE))
                return;
 
        printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",
-              m->mpc_apicid, m->mpc_apicver, m->mpc_apicaddr);
+              m->apicid, m->apicver, m->apicaddr);
 
-       if (bad_ioapic(m->mpc_apicaddr))
+       if (bad_ioapic(m->apicaddr))
                return;
 
-       mp_ioapics[nr_ioapics].mp_apicaddr = m->mpc_apicaddr;
-       mp_ioapics[nr_ioapics].mp_apicid = m->mpc_apicid;
-       mp_ioapics[nr_ioapics].mp_type = m->mpc_type;
-       mp_ioapics[nr_ioapics].mp_apicver = m->mpc_apicver;
-       mp_ioapics[nr_ioapics].mp_flags = m->mpc_flags;
+       mp_ioapics[nr_ioapics].mp_apicaddr = m->apicaddr;
+       mp_ioapics[nr_ioapics].mp_apicid = m->apicid;
+       mp_ioapics[nr_ioapics].mp_type = m->type;
+       mp_ioapics[nr_ioapics].mp_apicver = m->apicver;
+       mp_ioapics[nr_ioapics].mp_flags = m->flags;
        nr_ioapics++;
 }
 
@@ -513,11 +513,11 @@ static void __init construct_ioapic_table(int mpc_default_type)
                MP_bus_info(&bus);
        }
 
-       ioapic.mpc_type = MP_IOAPIC;
-       ioapic.mpc_apicid = 2;
-       ioapic.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01;
-       ioapic.mpc_flags = MPC_APIC_USABLE;
-       ioapic.mpc_apicaddr = 0xFEC00000;
+       ioapic.type = MP_IOAPIC;
+       ioapic.apicid = 2;
+       ioapic.apicver = mpc_default_type > 4 ? 0x10 : 0x01;
+       ioapic.flags = MPC_APIC_USABLE;
+       ioapic.apicaddr = 0xFEC00000;
        MP_ioapic_info(&ioapic);
 
        /*