arcnet: Remove unnecessary OOM messages

Alloc failures have generic stack dumps so these are redundant.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c
index e4a27029e1c0c764a1728b6da5d5c32bf3efadda..7fc5b0420d62cfb2e9cb266fd1b3b21343b988e7 100644 (file)
--- a/drivers/net/arcnet/arc-rawmode.c
+++ b/drivers/net/arcnet/arc-rawmode.c
@@ -98,7 +98,6 @@ static void rx(struct net_device *dev, int bufnum,
 
        skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
        if (skb == NULL) {
-               arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
                dev->stats.rx_dropped++;
                return;
        }

diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 92b553e70d5cb80a8c706f5ab0f6d93996ceafc4..de80d9e0e53f0091c6a6f90967336efbfcf1bc60 100644 (file)
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -57,7 +57,6 @@ static void rx(struct net_device *dev, int bufnum,
 
        skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC);
        if (skb == NULL) {
-               arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
                dev->stats.rx_dropped++;
                return;
        }
@@ -197,10 +196,8 @@ static int ack_tx(struct net_device *dev, int acked)
 
        /* Now alloc a skb to send back up through the layers: */
        ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
-       if (ackskb == NULL) {
-               arc_printk(D_NORMAL, dev, "Memory squeeze, can't acknowledge\n");
+       if (ackskb == NULL)
                goto free_outskb;
-       }
 
        skb_put(ackskb, length + ARC_HDR_SIZE);
        ackskb->dev = dev;

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 7247addf46debd45ceda348e031d20839f0b96aa..fc6809b43f8ff10fe7e129fbdb6db46488197cd9 100644 (file)
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -142,10 +142,8 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
 
                card = devm_kzalloc(&pdev->dev, sizeof(struct com20020_dev),
                                    GFP_KERNEL);
-               if (!card) {
-                       pr_err("%s out of memory!\n", __func__);
+               if (!card)
                        return -ENOMEM;
-               }
 
                card->index = i;
                card->pci_priv = priv;

diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c
index d5a0f907ac82121c3cb63a12b39f67843418bb75..7e7eda5b02325a326ca05d1509593af11388f805 100644 (file)
--- a/drivers/net/arcnet/rfc1051.c
+++ b/drivers/net/arcnet/rfc1051.c
@@ -134,7 +134,6 @@ static void rx(struct net_device *dev, int bufnum,
 
        skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
        if (skb == NULL) {
-               arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
                dev->stats.rx_dropped++;
                return;
        }

diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c
index 3dae14166120fc71ceff7b63f452a734d355fe5f..9040a8be155c32db85027fcbf267133bd2a68a84 100644 (file)
--- a/drivers/net/arcnet/rfc1201.c
+++ b/drivers/net/arcnet/rfc1201.c
@@ -179,7 +179,6 @@ static void rx(struct net_device *dev, int bufnum,
 
                skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
                if (skb == NULL) {
-                       arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
                        dev->stats.rx_dropped++;
                        return;
                }