PCI: Remove unnecessary messages for memory allocation failures

Per ebfdc40969f2 ("checkpatch: attempt to find unnecessary 'out of memory'
messages"), when a memory allocation fails, the memory subsystem emits
generic "out of memory" messages (see slab_out_of_memory() for some of this
logging).  Therefore, additional error messages in the caller don't add
much value.

Remove messages that merely report "out of memory".

This preserves some messages that report additional information, e.g.,
allocation failures that mean we drop hotplug events.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[bhelgaas: changelog, squash patches, make similar changes to acpiphp,
cpqphp, ibmphp, keep warning when dropping hotplug event]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 73cf84645c82..4f5c0b936797 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,
@@ -734,14 +732,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;
         }
 
@@ -1101,7 +1097,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;
         }
@@ -1208,7 +1203,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;
                 }
@@ -1306,7 +1300,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;
         }