Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Report pci_pme_active() kmalloc failure
  mn10300/PCI: Remove useless pcibios_last_bus
  frv/PCI: Remove pcibios_last_bus
  PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
  x86/PCI: Coalesce multiple overlapping host bridge windows
  MAINTAINERS: Add arch/x86/pci to PCI file patterns
  PCI/PM: Remove pci_pm_complete()
  PCI: Add pci_dev_show_local_cpu() to simplify code
  mn10300/PCI: Remove unused pci_mem_start
  cris/PCI: Remove unused pci_mem_start
  PCI: Make pci_dev_pm_ops static

Conflicts:
	drivers/pci/pci-sysfs.c

4 files changed, 24 insertions, 33 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index d5f90d6383bc..604265c40853 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -831,7 +831,7 @@ int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
         int status, maxvec;
         u16 msgctl;
 
-        if (!dev->msi_cap)
+        if (!dev->msi_cap || dev->current_state != PCI_D0)
                 return -EINVAL;
 
         pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
@@ -862,7 +862,7 @@ int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec)
         int ret, nvec;
         u16 msgctl;
 
-        if (!dev->msi_cap)
+        if (!dev->msi_cap || dev->current_state != PCI_D0)
                 return -EINVAL;
 
         pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
@@ -955,7 +955,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
         int status, nr_entries;
         int i, j;
 
-        if (!entries || !dev->msix_cap)
+        if (!entries || !dev->msix_cap || dev->current_state != PCI_D0)
                 return -EINVAL;
 
         status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSIX);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 9f85960a62ed..840fdc5ba0d8 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -602,18 +602,10 @@ static int pci_pm_prepare(struct device *dev)
         return error;
 }
 
-static void pci_pm_complete(struct device *dev)
-{
-        struct device_driver *drv = dev->driver;
-
-        if (drv && drv->pm && drv->pm->complete)
-                drv->pm->complete(dev);
-}
 
 #else /* !CONFIG_PM_SLEEP */
 
 #define pci_pm_prepare  NULL
-#define pci_pm_complete NULL
 
 #endif /* !CONFIG_PM_SLEEP */
 
@@ -1124,9 +1116,8 @@ static int pci_pm_runtime_idle(struct device *dev)
 
 #ifdef CONFIG_PM
 
-const struct dev_pm_ops pci_dev_pm_ops = {
+static const struct dev_pm_ops pci_dev_pm_ops = {
         .prepare = pci_pm_prepare,
-        .complete = pci_pm_complete,
         .suspend = pci_pm_suspend,
         .resume = pci_pm_resume,
         .freeze = pci_pm_freeze,
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 82cc45867eaa..2aaa83c85a4e 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -76,9 +76,11 @@ static ssize_t broken_parity_status_store(struct device *dev,
 }
 static DEVICE_ATTR_RW(broken_parity_status);
 
-static ssize_t local_cpus_show(struct device *dev,
-                        struct device_attribute *attr, char *buf)
-{               
+static ssize_t pci_dev_show_local_cpu(struct device *dev,
+                int type,
+                struct device_attribute *attr,
+                char *buf)
+{
         const struct cpumask *mask;
         int len;
 
@@ -88,29 +90,26 @@ static ssize_t local_cpus_show(struct device *dev,
 #else
         mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
 #endif
-        len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
+        len = type ?
+                cpumask_scnprintf(buf, PAGE_SIZE-2, mask) :
+                cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
+
         buf[len++] = '\n';
         buf[len] = '\0';
         return len;
 }
+
+static ssize_t local_cpus_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        return pci_dev_show_local_cpu(dev, 1, attr, buf);
+}
 static DEVICE_ATTR_RO(local_cpus);
 
 static ssize_t local_cpulist_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        const struct cpumask *mask;
-        int len;
-
-#ifdef CONFIG_NUMA
-        mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
-                                          cpumask_of_node(dev_to_node(dev));
-#else
-        mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
-#endif
-        len = cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
-        buf[len++] = '\n';
-        buf[len] = '\0';
-        return len;
+        return pci_dev_show_local_cpu(dev, 0, attr, buf);
 }
 static DEVICE_ATTR_RO(local_cpulist);
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index c0805f26f339..457f801fc49d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1638,8 +1638,10 @@ void pci_pme_active(struct pci_dev *dev, bool enable)
                 if (enable) {
                         pme_dev = kmalloc(sizeof(struct pci_pme_device),
                                           GFP_KERNEL);
-                        if (!pme_dev)
-                                goto out;
+                        if (!pme_dev) {
+                                dev_warn(&dev->dev, "can't enable PME#\n");
+                                return;
+                        }
                         pme_dev->dev = dev;
                         mutex_lock(&pci_pme_list_mutex);
                         list_add(&pme_dev->list, &pci_pme_list);
@@ -1660,7 +1662,6 @@ void pci_pme_active(struct pci_dev *dev, bool enable)
                 }
         }
 
-out:
         dev_dbg(&dev->dev, "PME# %s\n", enable ? "enabled" : "disabled");
 }