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

Commit 3c2cbd24 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: io-apic - code style cleaning for setup_IO_APIC_irqs 



By changing printout form we are able to shrink (and clean up) code a bit.

Former printout example:

	init IO_APIC IRQs
	 IO-APIC (apicid-pin) 1-1, 1-2, 1-3 not connected.
	 IO-APIC (apicid-pin) 2-1, 2-2, 2-3 not connected.

New printout example:

	init IO_APIC IRQs
	 1-1 1-2 1-3 (apicid-pin) not connected
	 2-1 2-2 2-3 (apicid-pin) not connected

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 26afe5f2

arch/x86/kernel/io_apic.c

+28 −25
Original line number Diff line number Diff line
@@ -1518,7 +1518,8 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, 


static void __init setup_IO_APIC_irqs(void)

{

	int apic, pin, idx, irq, first_notcon = 1;

	int apic, pin, idx, irq;

	int notcon = 0;



	apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");
@@ -1527,17 +1528,13 @@ static void __init setup_IO_APIC_irqs(void) 


			idx = find_irq_entry(apic, pin, mp_INT);

			if (idx == -1) {

			if (first_notcon) {

				apic_printk(APIC_VERBOSE, KERN_DEBUG " IO-APIC (apicid-pin) %d-%d", mp_ioapics[apic].mp_apicid, pin);

				first_notcon = 0;

			} else

				apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mp_apicid, pin);

				apic_printk(APIC_VERBOSE,

					KERN_DEBUG " %d-%d",

					mp_ioapics[apic].mp_apicid, pin);

				if (!notcon)

					notcon = 1;

				continue;

			}

		if (!first_notcon) {

			apic_printk(APIC_VERBOSE, " not connected.\n");

			first_notcon = 1;

		}



			irq = pin_2_irq(idx, apic, pin);

#ifdef CONFIG_X86_32
@@ -1549,10 +1546,16 @@ static void __init setup_IO_APIC_irqs(void) 
			setup_IO_APIC_irq(apic, pin, irq,

					irq_trigger(idx), irq_polarity(idx));

		}

		if (notcon) {

			apic_printk(APIC_VERBOSE,

				KERN_DEBUG " (apicid-pin) not connected\n");

			notcon = 0;

		}

	}



	if (!first_notcon)

		apic_printk(APIC_VERBOSE, " not connected.\n");

	if (notcon)

		apic_printk(APIC_VERBOSE,

			KERN_DEBUG " (apicid-pin) not connected\n");

}



/*