diff options
author | Joe Perches <joe@perches.com> | 2012-01-29 07:56:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-31 16:20:21 -0500 |
commit | e404decb0fb017be80552adee894b35307b6c7b4 (patch) | |
tree | 19b2324328eb1f8cef599f9f164dc9ca6e5699c9 /drivers/net/ethernet/marvell | |
parent | 5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5 (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/marvell')
-rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 953ba5851f7b..92b4b4e68e3b 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c | |||
@@ -1017,10 +1017,9 @@ static int rxq_init(struct net_device *dev) | |||
1017 | /* Allocate RX skb rings */ | 1017 | /* Allocate RX skb rings */ |
1018 | pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size, | 1018 | pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size, |
1019 | GFP_KERNEL); | 1019 | GFP_KERNEL); |
1020 | if (!pep->rx_skb) { | 1020 | if (!pep->rx_skb) |
1021 | printk(KERN_ERR "%s: Cannot alloc RX skb ring\n", dev->name); | ||
1022 | return -ENOMEM; | 1021 | return -ENOMEM; |
1023 | } | 1022 | |
1024 | /* Allocate RX ring */ | 1023 | /* Allocate RX ring */ |
1025 | pep->rx_desc_count = 0; | 1024 | pep->rx_desc_count = 0; |
1026 | size = pep->rx_ring_size * sizeof(struct rx_desc); | 1025 | size = pep->rx_ring_size * sizeof(struct rx_desc); |
@@ -1081,10 +1080,9 @@ static int txq_init(struct net_device *dev) | |||
1081 | 1080 | ||
1082 | pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size, | 1081 | pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size, |
1083 | GFP_KERNEL); | 1082 | GFP_KERNEL); |
1084 | if (!pep->tx_skb) { | 1083 | if (!pep->tx_skb) |
1085 | printk(KERN_ERR "%s: Cannot alloc TX skb ring\n", dev->name); | ||
1086 | return -ENOMEM; | 1084 | return -ENOMEM; |
1087 | } | 1085 | |
1088 | /* Allocate TX ring */ | 1086 | /* Allocate TX ring */ |
1089 | pep->tx_desc_count = 0; | 1087 | pep->tx_desc_count = 0; |
1090 | size = pep->tx_ring_size * sizeof(struct tx_desc); | 1088 | size = pep->tx_ring_size * sizeof(struct tx_desc); |