aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/oki-semi/pch_gbe
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/ethernet/oki-semi/pch_gbe
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/ethernet/oki-semi/pch_gbe')
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 3ead111111e1..0217991fede7 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1587,10 +1587,8 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
1587 1587
1588 size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count; 1588 size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count;
1589 tx_ring->buffer_info = vzalloc(size); 1589 tx_ring->buffer_info = vzalloc(size);
1590 if (!tx_ring->buffer_info) { 1590 if (!tx_ring->buffer_info)
1591 pr_err("Unable to allocate memory for the buffer information\n");
1592 return -ENOMEM; 1591 return -ENOMEM;
1593 }
1594 1592
1595 tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc); 1593 tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc);
1596 1594
@@ -1636,10 +1634,9 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
1636 1634
1637 size = (int)sizeof(struct pch_gbe_buffer) * rx_ring->count; 1635 size = (int)sizeof(struct pch_gbe_buffer) * rx_ring->count;
1638 rx_ring->buffer_info = vzalloc(size); 1636 rx_ring->buffer_info = vzalloc(size);
1639 if (!rx_ring->buffer_info) { 1637 if (!rx_ring->buffer_info)
1640 pr_err("Unable to allocate memory for the receive descriptor ring\n");
1641 return -ENOMEM; 1638 return -ENOMEM;
1642 } 1639
1643 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc); 1640 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
1644 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size, 1641 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
1645 &rx_ring->dma, GFP_KERNEL); 1642 &rx_ring->dma, GFP_KERNEL);