Merge tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

Pull PCI updates from Bjorn Helgaas:
 "PCI changes for the v3.10 merge window:

  PCI device hotplug
   - Remove ACPI PCI subdrivers (Jiang Liu, Myron Stowe)
   - Make acpiphp builtin only, not modular (Jiang Liu)
   - Add acpiphp mutual exclusion (Jiang Liu)

  Power management
   - Skip "PME enabled/disabled" messages when not supported (Rafael
     Wysocki)
   - Fix fallback to PCI_D0 (Rafael Wysocki)

  Miscellaneous
   - Factor quirk_io_region (Yinghai Lu)
   - Cache MSI capability offsets & cleanup (Gavin Shan, Bjorn Helgaas)
   - Clean up EISA resource initialization and logging (Bjorn Helgaas)
   - Fix prototype warnings (Andy Shevchenko, Bjorn Helgaas)
   - MIPS: Initialize of_node before scanning bus (Gabor Juhos)
   - Fix pcibios_get_phb_of_node() declaration "weak" annotation (Gabor
     Juhos)
   - Add MSI INTX_DISABLE quirks for AR8161/AR8162/etc (Xiong Huang)
   - Fix aer_inject return values (Prarit Bhargava)
   - Remove PME/ACPI dependency (Andrew Murray)
   - Use shared PCI_BUS_NUM() and PCI_DEVID() (Shuah Khan)"

* tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (63 commits)
  vfio-pci: Use cached MSI/MSI-X capabilities
  vfio-pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
  PCI: Remove "extern" from function declarations
  PCI: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
  PCI: Drop msi_mask_reg() and remove drivers/pci/msi.h
  PCI: Use msix_table_size() directly, drop multi_msix_capable()
  PCI: Drop msix_table_offset_reg() and msix_pba_offset_reg() macros
  PCI: Drop is_64bit_address() and is_mask_bit_support() macros
  PCI: Drop msi_data_reg() macro
  PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros
  PCI: Drop msi_control_reg() macro and use PCI_MSI_FLAGS directly
  PCI: Use cached MSI/MSI-X offsets from dev, not from msi_desc
  PCI: Clean up MSI/MSI-X capability #defines
  PCI: Use cached MSI-X cap while enabling MSI-X
  PCI: Use cached MSI cap while enabling MSI interrupts
  PCI: Remove MSI/MSI-X cap check in pci_msi_check_device()
  PCI: Cache MSI/MSI-X capability offsets in struct pci_dev
  PCI: Use u8, not int, for PM capability offset
  [SCSI] megaraid_sas: Use correct #define for MSI-X capability
  PCI: Remove "extern" from function declarations
  ...

diff --cc drivers/acpi/pci_root.c
index 6ae5e440436ef46a9ca518303575fa31963cb23f,b80e06e0b2d9af965ee453901fb13370e6eda3ca..ac8688b897056c247b0e2f35fb4ffbba599e2ffe
--- 1/drivers/acpi/pci_root.c
--- 2/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@@ -413,8 -381,8 +381,7 @@@ static int acpi_pci_root_add(struct acp
        acpi_status status;
        int result;
        struct acpi_pci_root *root;
-       struct acpi_pci_driver *driver;
        u32 flags, base_flags;
 -      bool is_osc_granted = false;
  
        root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
        if (!root)

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/eisa/pci_eisa.c
index 6c3fca97d346db9c6912bd3977eec99c5c7d563a,0d42ea791060a3e6662e4ac9b2f80d24487cc570..a333bf3517de63a445c2636e85fb43cdc1d54c23
--- 1/drivers/eisa/pci_eisa.c
--- 2/drivers/eisa/pci_eisa.c
+++ b/drivers/eisa/pci_eisa.c
@@@ -19,14 -19,13 +19,13 @@@
  /* There is only *one* pci_eisa device per machine, right ? */
  static struct eisa_root_device pci_eisa_root;
  
 -static int __init pci_eisa_init(struct pci_dev *pdev,
 -                              const struct pci_device_id *ent)
 +static int __init pci_eisa_init(struct pci_dev *pdev)
  {
 -      int rc;
 +      int rc, i;
 +      struct resource *res, *bus_res = NULL;
  
        if ((rc = pci_enable_device (pdev))) {
-               printk (KERN_ERR "pci_eisa : Could not enable device %s\n",
-                       pci_name(pdev));
+               dev_err(&pdev->dev, "Could not enable device\n");
                return rc;
        }
  

diff --cc drivers/iommu/amd_iommu.c
Simple merge

diff --cc drivers/iommu/amd_iommu_init.c
Simple merge

diff --cc drivers/pci/pci-acpi.c
Simple merge

diff --cc drivers/pci/pcie/portdrv_pci.c
Simple merge

diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge

diff --cc include/linux/pci.h
Simple merge