summaryrefslogtreecommitdiff
path: root/drivers/pci/rom.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-01-31 19:12:56 +0300
committerBjorn Helgaas <helgaas@kernel.org>2018-01-31 19:12:56 +0300
commit414ae7609e19580a56647344e61f13f3768e0820 (patch)
treef4a2e50f589d459406e5c1dae1cb06b8f4668b03 /drivers/pci/rom.c
parent11377725da463951cd501f5cecce30af999ee338 (diff)
parenta9b94b74806b47348727aa3334a0541427e0061b (diff)
downloadlinux-414ae7609e19580a56647344e61f13f3768e0820.tar.xz
Merge branch 'pci/resource' into next
* pci/resource: PCI: tegra: Remove PCI_REASSIGN_ALL_BUS use on Tegra resource: Set type when reserving new regions resource: Set type of "reserve=" user-specified resources irqchip/i8259: Set I/O port resource types correctly powerpc: Set I/O port resource types correctly MIPS: Set I/O port resource types correctly vgacon: Set VGA struct resource types PCI: Use dev_info() rather than dev_err() for ROM validation PCI: Remove PCI_REASSIGN_ALL_RSRC use on arm and arm64 PCI: Remove sysfs resource mmap warning Conflicts: drivers/pci/rom.c
Diffstat (limited to 'drivers/pci/rom.c')
-rw-r--r--drivers/pci/rom.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 61f9e8a5ea8b..2f8fcd9ba5c1 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -92,15 +92,15 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
void __iomem *pds;
/* Standard PCI ROMs start out with these bytes 55 AA */
if (readw(image) != 0xAA55) {
- pci_err(pdev, "Invalid PCI ROM header signature: expecting 0xaa55, got %#06x\n",
- readw(image));
+ pci_info(pdev, "Invalid PCI ROM header signature: expecting 0xaa55, got %#06x\n",
+ readw(image));
break;
}
/* get the PCI data structure and check its "PCIR" signature */
pds = image + readw(image + 24);
if (readl(pds) != 0x52494350) {
- pci_err(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",
- readl(pds));
+ pci_info(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",
+ readl(pds));
break;
}
last_image = readb(pds + 21) & 0x80;