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/wireless/hostap/hostap_hw.c | |
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/wireless/hostap/hostap_hw.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index a8bddd81b4d1..aa15cc4269a1 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
@@ -347,11 +347,9 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0, | |||
347 | return -EINTR; | 347 | return -EINTR; |
348 | 348 | ||
349 | entry = kzalloc(sizeof(*entry), GFP_ATOMIC); | 349 | entry = kzalloc(sizeof(*entry), GFP_ATOMIC); |
350 | if (entry == NULL) { | 350 | if (entry == NULL) |
351 | printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n", | ||
352 | dev->name); | ||
353 | return -ENOMEM; | 351 | return -ENOMEM; |
354 | } | 352 | |
355 | atomic_set(&entry->usecnt, 1); | 353 | atomic_set(&entry->usecnt, 1); |
356 | entry->type = CMD_SLEEP; | 354 | entry->type = CMD_SLEEP; |
357 | entry->cmd = cmd; | 355 | entry->cmd = cmd; |
@@ -515,11 +513,9 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0, | |||
515 | } | 513 | } |
516 | 514 | ||
517 | entry = kzalloc(sizeof(*entry), GFP_ATOMIC); | 515 | entry = kzalloc(sizeof(*entry), GFP_ATOMIC); |
518 | if (entry == NULL) { | 516 | if (entry == NULL) |
519 | printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc " | ||
520 | "failed\n", dev->name); | ||
521 | return -ENOMEM; | 517 | return -ENOMEM; |
522 | } | 518 | |
523 | atomic_set(&entry->usecnt, 1); | 519 | atomic_set(&entry->usecnt, 1); |
524 | entry->type = CMD_CALLBACK; | 520 | entry->type = CMD_CALLBACK; |
525 | entry->cmd = cmd; | 521 | entry->cmd = cmd; |
@@ -2978,11 +2974,9 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set) | |||
2978 | local = iface->local; | 2974 | local = iface->local; |
2979 | 2975 | ||
2980 | new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC); | 2976 | new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC); |
2981 | if (new_entry == NULL) { | 2977 | if (new_entry == NULL) |
2982 | printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n", | ||
2983 | local->dev->name); | ||
2984 | return -ENOMEM; | 2978 | return -ENOMEM; |
2985 | } | 2979 | |
2986 | new_entry->aid = aid; | 2980 | new_entry->aid = aid; |
2987 | new_entry->set = set; | 2981 | new_entry->set = set; |
2988 | 2982 | ||