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/tokenring | |
| 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/tokenring')
| -rw-r--r-- | drivers/net/tokenring/3c359.c | 4 | ||||
| -rw-r--r-- | drivers/net/tokenring/madgemc.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index ef9fdf3652f..d7c292aa76b 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
| @@ -674,15 +674,11 @@ static int xl_open(struct net_device *dev) | |||
| 674 | /* These MUST be on 8 byte boundaries */ | 674 | /* These MUST be on 8 byte boundaries */ |
| 675 | xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL); | 675 | xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL); |
| 676 | if (xl_priv->xl_tx_ring == NULL) { | 676 | if (xl_priv->xl_tx_ring == NULL) { |
| 677 | printk(KERN_WARNING "%s: Not enough memory to allocate tx buffers.\n", | ||
| 678 | dev->name); | ||
| 679 | free_irq(dev->irq,dev); | 677 | free_irq(dev->irq,dev); |
| 680 | return -ENOMEM; | 678 | return -ENOMEM; |
| 681 | } | 679 | } |
| 682 | xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL); | 680 | xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL); |
| 683 | if (xl_priv->xl_rx_ring == NULL) { | 681 | if (xl_priv->xl_rx_ring == NULL) { |
| 684 | printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", | ||
| 685 | dev->name); | ||
| 686 | free_irq(dev->irq,dev); | 682 | free_irq(dev->irq,dev); |
| 687 | kfree(xl_priv->xl_tx_ring); | 683 | kfree(xl_priv->xl_tx_ring); |
| 688 | return -ENOMEM; | 684 | return -ENOMEM; |
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 6153cfd696b..1cdc034f6ae 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
| @@ -171,7 +171,6 @@ static int __devinit madgemc_probe(struct device *device) | |||
| 171 | 171 | ||
| 172 | card = kmalloc(sizeof(struct card_info), GFP_KERNEL); | 172 | card = kmalloc(sizeof(struct card_info), GFP_KERNEL); |
| 173 | if (card==NULL) { | 173 | if (card==NULL) { |
| 174 | printk("madgemc: unable to allocate card struct\n"); | ||
| 175 | ret = -ENOMEM; | 174 | ret = -ENOMEM; |
| 176 | goto getout1; | 175 | goto getout1; |
| 177 | } | 176 | } |
