6 files changed, 5 insertions, 32 deletions

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 848bfb84c04c..6d51aa68ec7a 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -3,7 +3,6 @@
 #
 config ARCH_SUPPORTS_MSI
         bool
-        default n
 
 config PCI_MSI
         bool "Message Signaled Interrupts (MSI and MSI-X)"
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index e43908d9b5df..36112fe212d3 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -2890,27 +2890,8 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
                                                 func->mem_head = mem_node;
                                         } else
                                                 return -ENOMEM;
-                                } else if ((temp_register & 0x0BL) == 0x04) {
-                                        /* Map memory */
-                                        base = temp_register & 0xFFFFFFF0;
-                                        base = ~base + 1;
-
-                                        dbg("CND:      length = 0x%x\n", base);
-                                        mem_node = get_resource(&(resources->mem_head), base);
-
-                                        /* allocate the resource to the board */
-                                        if (mem_node) {
-                                                base = mem_node->base;
-
-                                                mem_node->next = func->mem_head;
-                                                func->mem_head = mem_node;
-                                        } else
-                                                return -ENOMEM;
-                                } else if ((temp_register & 0x0BL) == 0x06) {
-                                        /* Those bits are reserved, we can't handle this */
-                                        return 1;
                                 } else {
-                                        /* Requesting space below 1M */
+                                        /* Reserved bits or requesting space below 1M */
                                         return NOT_ENOUGH_RESOURCES;
                                 }
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 028bbc219859..54858838f098 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1491,7 +1491,7 @@ void pci_pme_wakeup_bus(struct pci_bus *bus)
 
 /**
  * pci_wakeup - Wake up a PCI device
- * @dev: Device to handle.
+ * @pci_dev: Device to handle.
  * @ign: ignored parameter
  */
 static int pci_wakeup(struct pci_dev *pci_dev, void *ign)
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index cd46d74ec806..06bad96af415 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -509,14 +509,12 @@ static void do_recovery(struct pci_dev *dev, int severity)
                                 "resume",
                                 report_resume);
 
-        dev_printk(KERN_DEBUG, &dev->dev,
-                "AER driver successfully recovered\n");
+        dev_info(&dev->dev, "AER: Device recovery successful\n");
         return;
 
 failed:
         /* TODO: Should kernel panic here? */
-        dev_printk(KERN_DEBUG, &dev->dev,
-                "AER driver didn't recover\n");
+        dev_info(&dev->dev, "AER: Device recovery failed\n");
 }
 
 /**
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3cdba8b3f816..23961117663f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1748,11 +1748,6 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
                            "busn_res: can not insert %pR under %s%pR (conflicts with %s %pR)\n",
                             res, pci_is_root_bus(b) ? "domain " : "",
                             parent_res, conflict->name, conflict);
-        else
-                dev_printk(KERN_DEBUG, &b->dev,
-                           "busn_res: %pR is inserted under %s%pR\n",
-                           res, pci_is_root_bus(b) ? "domain " : "",
-                           parent_res);
 
         return conflict == NULL;
 }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index f3b074eb117c..be1de01de1c4 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1504,7 +1504,7 @@ enum pci_fixup_pass {
 /* Anonymous variables would be nice... */
 #define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, class, \
                                   class_shift, hook)                    \
-        static const struct pci_fixup const __pci_fixup_##name __used   \
+        static const struct pci_fixup __pci_fixup_##name __used         \
         __attribute__((__section__(#section), aligned((sizeof(void *)))))    \
                 = { vendor, device, class, class_shift, hook };