From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 31 Jan 2018 16:12:56 +0000 (-0600)
Subject: Merge branch 'pci/resource' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=414ae7609e19580a56647344e61f13f3768e0820;p=linux.git

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
---

414ae7609e19580a56647344e61f13f3768e0820
diff --cc drivers/pci/rom.c
index 61f9e8a5ea8bf,68ab7c17955af..2f8fcd9ba5c1d
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@@ -92,15 -92,15 +92,15 @@@ size_t pci_get_rom_size(struct pci_dev 
  		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",
 -			dev_info(&pdev->dev, "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",
 -			dev_info(&pdev->dev, "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;