Commit fdcdaf6c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: use dev_printk in quirk messages 



Convert quirk printks to dev_printk().

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
CC: Olaf Dabrunz <od@suse.de>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent e9d82888

drivers/pci/quirks.c

+12 −15
Original line number Diff line number Diff line
@@ -1567,10 +1567,8 @@ static void quirk_reroute_to_boot_interrupts_intel(struct pci_dev *dev) 
		return;



	dev->irq_reroute_variant = INTEL_IRQ_REROUTE_VARIANT;



	printk(KERN_INFO "PCI quirk: reroute interrupts for 0x%04x:0x%04x\n",

	dev_info(&dev->dev, "rerouting interrupts for [%04x:%04x]\n",

		 dev->vendor, dev->device);

	return;

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_80333_0,	quirk_reroute_to_boot_interrupts_intel);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_80333_1,	quirk_reroute_to_boot_interrupts_intel);
@@ -1612,7 +1610,7 @@ static void quirk_disable_intel_boot_interrupt(struct pci_dev *dev) 
	pci_config_word |= INTEL_6300_DISABLE_BOOT_IRQ;

	pci_write_config_word(dev, INTEL_6300_IOAPIC_ABAR, pci_config_word);



	printk(KERN_INFO "disabled boot interrupt on device 0x%04x:0x%04x\n",

	dev_info(&dev->dev, "disabled boot interrupts on device [%04x:%04x]\n",

		 dev->vendor, dev->device);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ESB_10, 	quirk_disable_intel_boot_interrupt);
@@ -1645,8 +1643,8 @@ static void quirk_disable_broadcom_boot_interrupt(struct pci_dev *dev) 


	pci_write_config_dword(dev, BC_HT1000_FEATURE_REG, pci_config_dword);



	printk(KERN_INFO "disabled boot interrupts on PCI device"

			"0x%04x:0x%04x\n", dev->vendor, dev->device);

	dev_info(&dev->dev, "disabled boot interrupts on device [%04x:%04x]\n",

		 dev->vendor, dev->device);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS,   PCI_DEVICE_ID_SERVERWORKS_HT1000SB, 	quirk_disable_broadcom_boot_interrupt);

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SERVERWORKS,   PCI_DEVICE_ID_SERVERWORKS_HT1000SB, 	quirk_disable_broadcom_boot_interrupt);
@@ -1676,8 +1674,8 @@ static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev) 
	pci_config_dword &= ~AMD_813X_NOIOAMODE;

	pci_write_config_dword(dev, AMD_813X_MISC, pci_config_dword);



	printk(KERN_INFO "disabled boot interrupts on PCI device "

			"0x%04x:0x%04x\n", dev->vendor, dev->device);

	dev_info(&dev->dev, "disabled boot interrupts on device [%04x:%04x]\n",

		 dev->vendor, dev->device);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,   PCI_DEVICE_ID_AMD_8131_BRIDGE, 	quirk_disable_amd_813x_boot_interrupt);

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD,   PCI_DEVICE_ID_AMD_8132_BRIDGE, 	quirk_disable_amd_813x_boot_interrupt);
@@ -1693,14 +1691,13 @@ static void quirk_disable_amd_8111_boot_interrupt(struct pci_dev *dev) 


	pci_read_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, &pci_config_word);

	if (!pci_config_word) {

		printk(KERN_INFO "boot interrupts on PCI device 0x%04x:0x%04x "

				"already disabled\n",

				dev->vendor, dev->device);

		dev_info(&dev->dev, "boot interrupts on device [%04x:%04x] "

			 "already disabled\n", dev->vendor, dev->device);

		return;

	}

	pci_write_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, 0);

	printk(KERN_INFO "disabled boot interrupts on PCI device "

			"0x%04x:0x%04x\n", dev->vendor, dev->device);

	dev_info(&dev->dev, "disabled boot interrupts on device [%04x:%04x]\n",

		 dev->vendor, dev->device);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,   PCI_DEVICE_ID_AMD_8111_SMBUS, 	quirk_disable_amd_8111_boot_interrupt);

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD,   PCI_DEVICE_ID_AMD_8111_SMBUS, 	quirk_disable_amd_8111_boot_interrupt);