[PATCH] net: core: Remove unnecessary alloc/OOM messages

[Joe Perches]

alloc failures already get standardized OOM
messages and a dump_stack.

Signed-off-by: Joe Perches <j...@perches.com>
---
 net/core/dev.c            | 14 +++++---------
 net/core/netprio_cgroup.c |  4 +---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index a87bc74..e04bfdc 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5958,10 +5958,9 @@ static int netif_alloc_rx_queues(struct net_device *dev)
        BUG_ON(count < 1);
 
        rx = kcalloc(count, sizeof(struct netdev_rx_queue), GFP_KERNEL);
-       if (!rx) {
-               pr_err("netdev: Unable to allocate %u rx queues\n", count);
+       if (!rx)
                return -ENOMEM;
-       }
+
        dev->_rx = rx;
 
        for (i = 0; i < count; i++)
@@ -5992,10 +5991,9 @@ static int netif_alloc_netdev_queues(struct net_device 
*dev)
        BUG_ON(count < 1);
 
        tx = kcalloc(count, sizeof(struct netdev_queue), GFP_KERNEL);
-       if (!tx) {
-               pr_err("netdev: Unable to allocate %u tx queues\n", count);
+       if (!tx)
                return -ENOMEM;
-       }
+
        dev->_tx = tx;
 
        netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL);
@@ -6482,10 +6480,8 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, 
const char *name,
        alloc_size += NETDEV_ALIGN - 1;
 
        p = kzalloc(alloc_size, GFP_KERNEL);
-       if (!p) {
-               pr_err("alloc_netdev: Unable to allocate device\n");
+       if (!p)
                return NULL;
-       }
 
        dev = PTR_ALIGN(p, NETDEV_ALIGN);
        dev->padded = (char *)dev - (char *)p;
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 5e67def..0777d0a 100644
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -69,10 +69,8 @@ static int extend_netdev_table(struct net_device *dev, u32 
target_idx)
 
        /* allocate & copy */
        new = kzalloc(new_sz, GFP_KERNEL);
-       if (!new) {
-               pr_warn("Unable to alloc new priomap!\n");
+       if (!new)
                return -ENOMEM;
-       }
 
        if (old)
                memcpy(new->priomap, old->priomap,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/