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

Commit 7bcbc78d authored by Neil Horman's avatar Neil Horman Committed by Ingo Molnar
Browse files

x86: clean up arch/x86/kernel/early-quirks.c 



clean up checkpatch errors. No code changed.

      text    data     bss     dec     hex filename
       705     120       0     825     339 early-quirks.o.before
       705     120       0     825     339 early-quirks.o.after

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3b095a04

arch/x86/kernel/early-quirks.c

+47 −44
Original line number Diff line number Diff line
@@ -32,10 +32,13 @@ static void __init fix_hypertransport_config(int num, int slot, int func) 
	 */

	htcfg = read_pci_config(num, slot, func, 0x68);

	if (htcfg & (1 << 18)) {

		printk(KERN_INFO "Detected use of extended apic ids on hypertransport bus\n");

		printk(KERN_INFO "Detected use of extended apic ids "

				 "on hypertransport bus\n");

		if ((htcfg & (1 << 17)) == 0) {

			printk(KERN_INFO "Enabling hypertransport extended apic interrupt broadcast\n");

			printk(KERN_INFO "Note this is a bios bug, please contact your hw vendor\n");

			printk(KERN_INFO "Enabling hypertransport extended "

					 "apic interrupt broadcast\n");

			printk(KERN_INFO "Note this is a bios bug, "

					 "please contact your hw vendor\n");

			htcfg |= (1 << 17);

			write_pci_config(num, slot, func, 0x68, htcfg);

		}
@@ -130,33 +133,22 @@ static struct chipset early_qrk[] __initdata = { 
	{}

};



void __init early_quirks(void)

static void check_dev_quirk(int num, int slot, int func)

{

	int num, slot, func;



	if (!early_pci_allowed())

		return;



	/* Poor man's PCI discovery */

	for (num = 0; num < 32; num++) {

		for (slot = 0; slot < 32; slot++) {

			for (func = 0; func < 8; func++) {

	u16 class;

	u16 vendor;

	u16 device;

	u8 type;

	int i;



				class = read_pci_config_16(num,slot,func,

							PCI_CLASS_REVISION);

	class = read_pci_config_16(num, slot, func, PCI_CLASS_DEVICE);



	if (class == 0xffff)

					break;

		return;



				vendor = read_pci_config_16(num, slot, func,

							 PCI_VENDOR_ID);

	vendor = read_pci_config_16(num, slot, func, PCI_VENDOR_ID);



				device = read_pci_config_16(num, slot, func,

							PCI_DEVICE_ID);

	device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID);



	for (i = 0; early_qrk[i].f != NULL; i++) {

		if (((early_qrk[i].vendor == PCI_ANY_ID) ||
@@ -165,18 +157,29 @@ void __init early_quirks(void) 
			(early_qrk[i].device == device)) &&

			(!((early_qrk[i].class ^ class) &

			    early_qrk[i].class_mask))) {

						if ((early_qrk[i].flags & QFLAG_DONE) != QFLAG_DONE)

				if ((early_qrk[i].flags &

				     QFLAG_DONE) != QFLAG_DONE)

					early_qrk[i].f(num, slot, func);

				early_qrk[i].flags |= QFLAG_APPLIED;



			}

	}



	type = read_pci_config_byte(num, slot, func,

				    PCI_HEADER_TYPE);

	if (!(type & 0x80))

					break;

			}

		}

		return;

}



void __init early_quirks(void)

{

	int num, slot, func;



	if (!early_pci_allowed())

		return;



	/* Poor man's PCI discovery */

	for (num = 0; num < 32; num++)

		for (slot = 0; slot < 32; slot++)

			for (func = 0; func < 8; func++)

				check_dev_quirk(num, slot, func);

}