aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-01-29 07:56:23 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-31 16:20:21 -0500
commite404decb0fb017be80552adee894b35307b6c7b4 (patch)
tree19b2324328eb1f8cef599f9f164dc9ca6e5699c9 /drivers/net/vmxnet3
parent5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5 (diff)
drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages
alloc failures use dump_stack so emitting an additional out-of-memory message is an unnecessary duplication. Remove the allocation failure messages. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index be6aa353f6a1..87c0b586f11f 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -537,11 +537,8 @@ vmxnet3_tq_create(struct vmxnet3_tx_queue *tq,
537 537
538 tq->buf_info = kcalloc(tq->tx_ring.size, sizeof(tq->buf_info[0]), 538 tq->buf_info = kcalloc(tq->tx_ring.size, sizeof(tq->buf_info[0]),
539 GFP_KERNEL); 539 GFP_KERNEL);
540 if (!tq->buf_info) { 540 if (!tq->buf_info)
541 printk(KERN_ERR "%s: failed to allocate tx bufinfo\n",
542 adapter->netdev->name);
543 goto err; 541 goto err;
544 }
545 542
546 return 0; 543 return 0;
547 544
@@ -1519,11 +1516,9 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
1519 sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size + 1516 sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
1520 rq->rx_ring[1].size); 1517 rq->rx_ring[1].size);
1521 bi = kzalloc(sz, GFP_KERNEL); 1518 bi = kzalloc(sz, GFP_KERNEL);
1522 if (!bi) { 1519 if (!bi)
1523 printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
1524 adapter->netdev->name);
1525 goto err; 1520 goto err;
1526 } 1521
1527 rq->buf_info[0] = bi; 1522 rq->buf_info[0] = bi;
1528 rq->buf_info[1] = bi + rq->rx_ring[0].size; 1523 rq->buf_info[1] = bi + rq->rx_ring[0].size;
1529 1524
@@ -2964,8 +2959,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
2964 2959
2965 adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL); 2960 adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL);
2966 if (adapter->pm_conf == NULL) { 2961 if (adapter->pm_conf == NULL) {
2967 printk(KERN_ERR "Failed to allocate memory for %s\n",
2968 pci_name(pdev));
2969 err = -ENOMEM; 2962 err = -ENOMEM;
2970 goto err_alloc_pm; 2963 goto err_alloc_pm;
2971 } 2964 }
@@ -2974,8 +2967,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
2974 2967
2975 adapter->rss_conf = kmalloc(sizeof(struct UPT1_RSSConf), GFP_KERNEL); 2968 adapter->rss_conf = kmalloc(sizeof(struct UPT1_RSSConf), GFP_KERNEL);
2976 if (adapter->rss_conf == NULL) { 2969 if (adapter->rss_conf == NULL) {
2977 printk(KERN_ERR "Failed to allocate memory for %s\n",
2978 pci_name(pdev));
2979 err = -ENOMEM; 2970 err = -ENOMEM;
2980 goto err_alloc_rss; 2971 goto err_alloc_rss;
2981 } 2972 }