Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info

[Yinghai Lu <yinghai@kernel.org>]

On 12/07/2010 07:56 AM, Thomas Gleixner wrote:
> On Tue, 7 Dec 2010, Feng Tang wrote:
>> On Tue, 7 Dec 2010 01:50:36 +0800
>> Yinghai Lu <yinghai@kernel.org> wrote:
>>  
>> +static void assign_to_mp_irq(struct mpc_intsrc *m,
>> +				    struct mpc_intsrc *mp_irq)
>> +{
>> +	mp_irq->dstapic = m->dstapic;
>> +	mp_irq->type = m->type;
>> +	mp_irq->irqtype = m->irqtype;
>> +	mp_irq->irqflag = m->irqflag;
>> +	mp_irq->srcbus = m->srcbus;
>> +	mp_irq->srcbusirq = m->srcbusirq;
>> +	mp_irq->dstirq = m->dstirq;
> 
>   Can we please use the mrst version with memcpy ?
> 
>> +}
>> +
>> +static int mp_irq_mpc_intsrc_cmp(struct mpc_intsrc *mp_irq,
>> +					struct mpc_intsrc *m)
>> +{
>> +	if (mp_irq->dstapic != m->dstapic)
>> +		return 1;
>> +	if (mp_irq->type != m->type)
>> +		return 2;
>> +	if (mp_irq->irqtype != m->irqtype)
>> +		return 3;
>> +	if (mp_irq->irqflag != m->irqflag)
>> +		return 4;
>> +	if (mp_irq->srcbus != m->srcbus)
>> +		return 5;
>> +	if (mp_irq->srcbusirq != m->srcbusirq)
>> +		return 6;
>> +	if (mp_irq->dstirq != m->dstirq)
>> +		return 7;
>> +
>> +	return 0;
> 
>   Same here. No caller is interested in the detailed return value.
> 

ok, after look at code and git log,  i knew the reasons for those strange duplicated functions.

Alexy changed

 /* MP IRQ source entries */
-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
+struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];

to make it decouple that with mpstable definition. so mptable will have mpc_intsrc, and acpi etc will use mp_config_intsrc

and he planed to add more member to mp_config_intsrc .... never happened.

then I added those functions with different parameters.

one year later JSR changed all back to mpc_instr...

so now have some duplicated functions....

even in mpparse.c we now have

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",
                m->irqtype, m->irqflag & 3, (m->irqflag >> 2) & 3, m->srcbus,
                m->srcbusirq, m->dstapic, m->dstirq);
}

static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
{
        apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
                " IRQ %02x, APIC ID %x, APIC INT %02x\n",
                mp_irq->irqtype, mp_irq->irqflag & 3,
                (mp_irq->irqflag >> 2) & 3, mp_irq->srcbus,
                mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq);
}

...

So yes, we should use simple versions in arch/x86/kernel/acpi/boot.c. ( assume functions mrst.c are copied from there)

and should kill print_mp_irq_info or print_MP_intsrc_info...

Thanks

	Yinghai