firewire: remove unnecessary alloc/OOM messages

These are redundant to log messages from the mm core.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

5 files changed, 12 insertions, 30 deletions

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 13573e8f518f..7ef316fdc4d9 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -389,10 +389,8 @@ static void queue_bus_reset_event(struct client *client)
         struct bus_reset_event *e;
 
         e = kzalloc(sizeof(*e), GFP_KERNEL);
-        if (e == NULL) {
-                fw_notice(client->device->card, "out of memory when allocating event\n");
+        if (e == NULL)
                 return;
-        }
 
         fill_bus_reset_event(&e->reset, client);
 
@@ -693,10 +691,9 @@ static void handle_request(struct fw_card *card, struct fw_request *request,
 
         r = kmalloc(sizeof(*r), GFP_ATOMIC);
         e = kmalloc(sizeof(*e), GFP_ATOMIC);
-        if (r == NULL || e == NULL) {
-                fw_notice(card, "out of memory when allocating event\n");
+        if (r == NULL || e == NULL)
                 goto failed;
-        }
+
         r->card    = card;
         r->request = request;
         r->data    = payload;
@@ -930,10 +927,9 @@ static void iso_callback(struct fw_iso_context *context, u32 cycle,
         struct iso_interrupt_event *e;
 
         e = kmalloc(sizeof(*e) + header_length, GFP_ATOMIC);
-        if (e == NULL) {
-                fw_notice(context->card, "out of memory when allocating event\n");
+        if (e == NULL)
                 return;
-        }
+
         e->interrupt.type      = FW_CDEV_EVENT_ISO_INTERRUPT;
         e->interrupt.closure   = client->iso_closure;
         e->interrupt.cycle     = cycle;
@@ -950,10 +946,9 @@ static void iso_mc_callback(struct fw_iso_context *context,
         struct iso_interrupt_mc_event *e;
 
         e = kmalloc(sizeof(*e), GFP_ATOMIC);
-        if (e == NULL) {
-                fw_notice(context->card, "out of memory when allocating event\n");
+        if (e == NULL)
                 return;
-        }
+
         e->interrupt.type      = FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL;
         e->interrupt.closure   = client->iso_closure;
         e->interrupt.completed = fw_iso_buffer_lookup(&client->buffer,
@@ -1581,10 +1576,9 @@ void fw_cdev_handle_phy_packet(struct fw_card *card, struct fw_packet *p)
 
         list_for_each_entry(client, &card->phy_receiver_list, phy_receiver_link) {
                 e = kmalloc(sizeof(*e) + 8, GFP_ATOMIC);
-                if (e == NULL) {
-                        fw_notice(card, "out of memory when allocating event\n");
+                if (e == NULL)
                         break;
-                }
+
                 e->phy_packet.closure   = client->phy_receiver_closure;
                 e->phy_packet.type      = FW_CDEV_EVENT_PHY_PACKET_RECEIVED;
                 e->phy_packet.rcode     = RCODE_COMPLETE;
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 03ce7d980c6a..664a6ff0a823 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -692,10 +692,8 @@ static void create_units(struct fw_device *device)
                  * match the drivers id_tables against it.
                  */
                 unit = kzalloc(sizeof(*unit), GFP_KERNEL);
-                if (unit == NULL) {
-                        fw_err(device->card, "out of memory for unit\n");
+                if (unit == NULL)
                         continue;
-                }
 
                 unit->directory = ci.p + value - 1;
                 unit->device.bus = &fw_bus_type;
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 2b27bff2591a..75c1133e437c 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -368,10 +368,8 @@ static struct fwnet_fragment_info *fwnet_frag_new(
         }
 
         new = kmalloc(sizeof(*new), GFP_ATOMIC);
-        if (!new) {
-                dev_err(&pd->skb->dev->dev, "out of memory\n");
+        if (!new)
                 return NULL;
-        }
 
         new->offset = offset;
         new->len = len;
@@ -414,8 +412,6 @@ fail_w_fi:
 fail_w_new:
         kfree(new);
 fail:
-        dev_err(&net->dev, "out of memory\n");
-
         return NULL;
 }
 
@@ -692,7 +688,6 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 
                 skb = dev_alloc_skb(len + LL_RESERVED_SPACE(net));
                 if (unlikely(!skb)) {
-                        dev_err(&net->dev, "out of memory\n");
                         net->stats.rx_dropped++;
 
                         return -ENOMEM;
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 4a55b519b773..d9be53c1d806 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -3711,9 +3711,6 @@ static int pci_probe(struct pci_dev *dev,
         kfree(ohci);
         pmac_ohci_off(dev);
  fail:
-        if (err == -ENOMEM)
-                dev_err(&dev->dev, "out of memory\n");
-
         return err;
 }
 
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index cbf969abe311..47674b913843 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -1475,10 +1475,8 @@ static int sbp2_scsi_queuecommand(struct Scsi_Host *shost,
         }
 
         orb = kzalloc(sizeof(*orb), GFP_ATOMIC);
-        if (orb == NULL) {
-                dev_notice(lu_dev(lu), "failed to alloc ORB\n");
+        if (orb == NULL)
                 return SCSI_MLQUEUE_HOST_BUSY;
-        }
 
         /* Initialize rcode to something not RCODE_COMPLETE. */
         orb->base.rcode = -1;