Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 540d4e72 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: rename mpc_config_intsrc to mpc_intsrc 



Impact: cleanup, solve 80 columns wrap problems

mpc_config_intsrc should be renamed to mpc_intsrc.

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 2b85b5fb

arch/x86/include/asm/mpspec_def.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct mpc_ioapic { 
	unsigned int mpc_apicaddr;

};



struct mpc_config_intsrc {

struct mpc_intsrc {

	unsigned char mpc_type;

	unsigned char mpc_irqtype;

	unsigned short mpc_irqflag;

arch/x86/kernel/mpparse.c

+17 −20
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void __init MP_ioapic_info(struct mpc_ioapic *m) 
	nr_ioapics++;

}



static void print_MP_intsrc_info(struct mpc_config_intsrc *m)

static void print_MP_intsrc_info(struct mpc_intsrc *m)

{

	apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"

		" IRQ %02x, APIC ID %x, APIC INT %02x\n",
@@ -170,7 +170,7 @@ static void __init print_mp_irq_info(struct mp_config_intsrc *mp_irq) 
		mp_irq->mp_srcbusirq, mp_irq->mp_dstapic, mp_irq->mp_dstirq);

}



static void __init assign_to_mp_irq(struct mpc_config_intsrc *m,

static void __init assign_to_mp_irq(struct mpc_intsrc *m,

				    struct mp_config_intsrc *mp_irq)

{

	mp_irq->mp_dstapic = m->mpc_dstapic;
@@ -183,7 +183,7 @@ static void __init assign_to_mp_irq(struct mpc_config_intsrc *m, 
}



static void __init assign_to_mpc_intsrc(struct mp_config_intsrc *mp_irq,

					struct mpc_config_intsrc *m)

					struct mpc_intsrc *m)

{

	m->mpc_dstapic = mp_irq->mp_dstapic;

	m->mpc_type = mp_irq->mp_type;
@@ -195,7 +195,7 @@ static void __init assign_to_mpc_intsrc(struct mp_config_intsrc *mp_irq, 
}



static int __init mp_irq_mpc_intsrc_cmp(struct mp_config_intsrc *mp_irq,

					struct mpc_config_intsrc *m)

					struct mpc_intsrc *m)

{

	if (mp_irq->mp_dstapic != m->mpc_dstapic)

		return 1;
@@ -215,7 +215,7 @@ static int __init mp_irq_mpc_intsrc_cmp(struct mp_config_intsrc *mp_irq, 
	return 0;

}



static void __init MP_intsrc_info(struct mpc_config_intsrc *m)

static void __init MP_intsrc_info(struct mpc_intsrc *m)

{

	int i;
@@ -358,13 +358,12 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) 
		case MP_INTSRC:

			{

#ifdef CONFIG_X86_IO_APIC

				struct mpc_config_intsrc *m =

				    (struct mpc_config_intsrc *)mpt;

				struct mpc_intsrc *m = (struct mpc_intsrc *)mpt;



				MP_intsrc_info(m);

#endif

				mpt += sizeof(struct mpc_config_intsrc);

				count += sizeof(struct mpc_config_intsrc);

				mpt += sizeof(struct mpc_intsrc);

				count += sizeof(struct mpc_intsrc);

				break;

			}

		case MP_LINTSRC:
@@ -413,7 +412,7 @@ static int __init ELCR_trigger(unsigned int irq) 


static void __init construct_default_ioirq_mptable(int mpc_default_type)

{

	struct mpc_config_intsrc intsrc;

	struct mpc_intsrc intsrc;

	int i;

	int ELCR_fallback = 0;
@@ -799,7 +798,7 @@ void __init find_smp_config(void) 
#ifdef CONFIG_X86_IO_APIC

static u8 __initdata irq_used[MAX_IRQ_SOURCES];



static int  __init get_MP_intsrc_index(struct mpc_config_intsrc *m)

static int  __init get_MP_intsrc_index(struct mpc_intsrc *m)

{

	int i;
@@ -836,7 +835,7 @@ static int __init get_MP_intsrc_index(struct mpc_config_intsrc *m) 


#define SPARE_SLOT_NUM 20



static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM];

static struct mpc_intsrc __initdata *m_spare[SPARE_SLOT_NUM];

#endif



static int  __init replace_intsrc_all(struct mpc_table *mpc,
@@ -877,8 +876,7 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, 
		case MP_INTSRC:

			{

#ifdef CONFIG_X86_IO_APIC

				struct mpc_config_intsrc *m =

				    (struct mpc_config_intsrc *)mpt;

				struct mpc_intsrc *m = (struct mpc_intsrc *)mpt;



				printk(KERN_INFO "OLD ");

				print_MP_intsrc_info(m);
@@ -899,8 +897,8 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, 
					nr_m_spare++;

				}

#endif

				mpt += sizeof(struct mpc_config_intsrc);

				count += sizeof(struct mpc_config_intsrc);

				mpt += sizeof(struct mpc_intsrc);

				count += sizeof(struct mpc_intsrc);

				break;

			}

		case MP_LINTSRC:
@@ -938,9 +936,8 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, 
			assign_to_mpc_intsrc(&mp_irqs[i], m_spare[nr_m_spare]);

			m_spare[nr_m_spare] = NULL;

		} else {

			struct mpc_config_intsrc *m =

			    (struct mpc_config_intsrc *)mpt;

			count += sizeof(struct mpc_config_intsrc);

			struct mpc_intsrc *m = (struct mpc_intsrc *)mpt;

			count += sizeof(struct mpc_intsrc);

			if (!mpc_new_phys) {

				printk(KERN_INFO "No spare slots, try to append...take your risk, new mpc_length %x\n", count);

			} else {
@@ -953,7 +950,7 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, 
			}

			assign_to_mpc_intsrc(&mp_irqs[i], m);

			mpc->mpc_length = count;

			mpt += sizeof(struct mpc_config_intsrc);

			mpt += sizeof(struct mpc_intsrc);

		}

		print_mp_irq_info(&mp_irqs[i]);

	}