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/hippi | |
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/hippi')
-rw-r--r-- | drivers/net/hippi/rrunner.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index e68c941926f1..2a51363d9fed 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c | |||
@@ -1600,12 +1600,8 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1600 | } | 1600 | } |
1601 | 1601 | ||
1602 | image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); | 1602 | image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); |
1603 | if (!image){ | 1603 | if (!image) |
1604 | printk(KERN_ERR "%s: Unable to allocate memory " | ||
1605 | "for EEPROM image\n", dev->name); | ||
1606 | return -ENOMEM; | 1604 | return -ENOMEM; |
1607 | } | ||
1608 | |||
1609 | 1605 | ||
1610 | if (rrpriv->fw_running){ | 1606 | if (rrpriv->fw_running){ |
1611 | printk("%s: Firmware already running\n", dev->name); | 1607 | printk("%s: Firmware already running\n", dev->name); |
@@ -1637,8 +1633,6 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1637 | image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); | 1633 | image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); |
1638 | oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); | 1634 | oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); |
1639 | if (!image || !oldimage) { | 1635 | if (!image || !oldimage) { |
1640 | printk(KERN_ERR "%s: Unable to allocate memory " | ||
1641 | "for EEPROM image\n", dev->name); | ||
1642 | error = -ENOMEM; | 1636 | error = -ENOMEM; |
1643 | goto wf_out; | 1637 | goto wf_out; |
1644 | } | 1638 | } |