x86: rename all fields of mpc_lintsrc mpc_X to X
PATCH 2/7 x86: rename all fields of mpc_lintsrc 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 <[email protected]>
--- arch/x86/include/asm/mpspec_def.h | 14 +++++++------- arch/x86/kernel/mpparse.c | 19 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-)
arch/x86/include/asm/mpspec_def.h +7 -7
@@ -140,13 +140,13 @@ enum mp_irq_source_types {#define MP_APIC_ALL 0xFFstruct mpc_lintsrc { -unsigned char mpc_type; -unsigned char mpc_irqtype; -unsigned short mpc_irqflag; -unsigned char mpc_srcbusid; -unsigned char mpc_srcbusirq; -unsigned char mpc_destapic; -unsigned char mpc_destapiclint; +unsigned char type; +unsigned char irqtype; +unsigned short irqflag; +unsigned char srcbusid; +unsigned char srcbusirq; +unsigned char destapic; +unsigned char destapiclint; };#define MPC_OEM_SIGNATURE "_OEM"
arch/x86/kernel/mpparse.c +9 -10
@@ -237,9 +237,8 @@ static void __init MP_lintsrc_info(struct mpc_lintsrc *m) {apic_printk (APIC_VERBOSE ,"Lint: type %d, pol %d, trig %d, bus %02x," " IRQ %02x, APIC ID %x, APIC LINT %02x\n" , - m->mpc_irqtype, m->mpc_irqflag &3 , - (m->mpc_irqflag >>2 ) &3 , m->mpc_srcbusid, - m->mpc_srcbusirq, m->mpc_destapic, m->mpc_destapiclint); + m->irqtype, m->irqflag &3 , (m->irqflag >>2 ) &3 , m->srcbusid, + m->srcbusirq, m->destapic, m->destapiclint); }/*
@@ -560,14 +559,14 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)construct_ioapic_table (mpc_default_type); - lintsrc.mpc_type =MP_LINTSRC ; - lintsrc.mpc_irqflag =0 ;/* conforming */ - lintsrc.mpc_srcbusid =0 ; - lintsrc.mpc_srcbusirq =0 ; - lintsrc.mpc_destapic =MP_APIC_ALL ; + lintsrc.type =MP_LINTSRC ; + lintsrc.irqflag =0 ;/* conforming */ + lintsrc.srcbusid =0 ; + lintsrc.srcbusirq =0 ; + lintsrc.destapic =MP_APIC_ALL ;for (i =0 ; i <2 ; i++) { - lintsrc.mpc_irqtype = linttypes[i]; - lintsrc.mpc_destapiclint = i; + lintsrc.irqtype = linttypes[i]; + lintsrc.destapiclint = i;MP_lintsrc_info (&lintsrc); } }
Signature · 1 line
1.5.5.1