Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Add dummy pci_irqd_intx_xlate() for CONFIG_PCI=n build
  PCI: Add wrappers for dev_printk()
  PCI: Remove unnecessary messages for memory allocation failures
  PCI: Add #defines for Completion Timeout Disable feature
  hinic: Replace PCI pool old API
  net: e100: Replace PCI pool old API
  block: DAC960: Replace PCI pool old API
  MAINTAINERS: Include more PCI files
  PCI: Remove unneeded kallsyms include
  powerpc/pci: Unroll two pass loop when scanning bridges
  powerpc/pci: Use for_each_pci_bridge() helper

1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 92dd88296817..4985e681e48f 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -603,10 +603,8 @@ int ibmphp_update_slot_info(struct slot *slot_cur)
         u8 mode;
 
         info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
-        if (!info) {
-                err("out of system memory\n");
+        if (!info)
                 return -ENOMEM;
-        }
 
         info->power_status = SLOT_PWRGD(slot_cur->status);
         info->attention_status = SLOT_ATTN(slot_cur->status,
@@ -735,14 +733,12 @@ static u8 bus_structure_fixup(u8 busno)
                 return 1;
 
         bus = kmalloc(sizeof(*bus), GFP_KERNEL);
-        if (!bus) {
-                err("%s - out of memory\n", __func__);
+        if (!bus)
                 return 1;
-        }
+
         dev = kmalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev) {
                 kfree(bus);
-                err("%s - out of memory\n", __func__);
                 return 1;
         }
 
@@ -1102,7 +1098,6 @@ static int enable_slot(struct hotplug_slot *hs)
         if (!slot_cur->func) {
                 /* We cannot do update_slot_info here, since no memory for
                  * kmalloc n.e.ways, and update_slot_info allocates some */
-                err("out of system memory\n");
                 rc = -ENOMEM;
                 goto error_power;
         }
@@ -1209,7 +1204,6 @@ int ibmphp_do_disable_slot(struct slot *slot_cur)
                 /* We need this for functions that were there on bootup */
                 slot_cur->func = kzalloc(sizeof(struct pci_func), GFP_KERNEL);
                 if (!slot_cur->func) {
-                        err("out of system memory\n");
                         rc = -ENOMEM;
                         goto error;
                 }
@@ -1307,7 +1301,6 @@ static int __init ibmphp_init(void)
 
         ibmphp_pci_bus = kmalloc(sizeof(*ibmphp_pci_bus), GFP_KERNEL);
         if (!ibmphp_pci_bus) {
-                err("out of memory\n");
                 rc = -ENOMEM;
                 goto exit;
         }