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/brocade/bna/bnad_debugfs.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/ethernet/brocade/bna/bnad_debugfs.c')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c index 592ad3929f5..c9fdceb135f 100644 --- a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c +++ b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c | |||
@@ -62,8 +62,6 @@ bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file) | |||
62 | if (!fw_debug->debug_buffer) { | 62 | if (!fw_debug->debug_buffer) { |
63 | kfree(fw_debug); | 63 | kfree(fw_debug); |
64 | fw_debug = NULL; | 64 | fw_debug = NULL; |
65 | pr_warn("bna %s: Failed to allocate fwtrc buffer\n", | ||
66 | pci_name(bnad->pcidev)); | ||
67 | return -ENOMEM; | 65 | return -ENOMEM; |
68 | } | 66 | } |
69 | 67 | ||
@@ -105,8 +103,6 @@ bnad_debugfs_open_fwsave(struct inode *inode, struct file *file) | |||
105 | if (!fw_debug->debug_buffer) { | 103 | if (!fw_debug->debug_buffer) { |
106 | kfree(fw_debug); | 104 | kfree(fw_debug); |
107 | fw_debug = NULL; | 105 | fw_debug = NULL; |
108 | pr_warn("bna %s: Failed to allocate fwsave buffer\n", | ||
109 | pci_name(bnad->pcidev)); | ||
110 | return -ENOMEM; | 106 | return -ENOMEM; |
111 | } | 107 | } |
112 | 108 | ||
@@ -208,8 +204,6 @@ bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file) | |||
208 | if (!drv_info->debug_buffer) { | 204 | if (!drv_info->debug_buffer) { |
209 | kfree(drv_info); | 205 | kfree(drv_info); |
210 | drv_info = NULL; | 206 | drv_info = NULL; |
211 | pr_warn("bna %s: Failed to allocate drv info buffer\n", | ||
212 | pci_name(bnad->pcidev)); | ||
213 | return -ENOMEM; | 207 | return -ENOMEM; |
214 | } | 208 | } |
215 | 209 | ||
@@ -348,11 +342,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf, | |||
348 | 342 | ||
349 | /* Allocate memory to store the user space buf */ | 343 | /* Allocate memory to store the user space buf */ |
350 | kern_buf = kzalloc(nbytes, GFP_KERNEL); | 344 | kern_buf = kzalloc(nbytes, GFP_KERNEL); |
351 | if (!kern_buf) { | 345 | if (!kern_buf) |
352 | pr_warn("bna %s: Failed to allocate user buffer\n", | ||
353 | pci_name(bnad->pcidev)); | ||
354 | return -ENOMEM; | 346 | return -ENOMEM; |
355 | } | ||
356 | 347 | ||
357 | if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) { | 348 | if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) { |
358 | kfree(kern_buf); | 349 | kfree(kern_buf); |
@@ -373,11 +364,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf, | |||
373 | bnad->reglen = 0; | 364 | bnad->reglen = 0; |
374 | 365 | ||
375 | bnad->regdata = kzalloc(len << 2, GFP_KERNEL); | 366 | bnad->regdata = kzalloc(len << 2, GFP_KERNEL); |
376 | if (!bnad->regdata) { | 367 | if (!bnad->regdata) |
377 | pr_warn("bna %s: Failed to allocate regrd buffer\n", | ||
378 | pci_name(bnad->pcidev)); | ||
379 | return -ENOMEM; | 368 | return -ENOMEM; |
380 | } | ||
381 | 369 | ||
382 | bnad->reglen = len << 2; | 370 | bnad->reglen = len << 2; |
383 | rb = bfa_ioc_bar0(ioc); | 371 | rb = bfa_ioc_bar0(ioc); |
@@ -421,11 +409,8 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf, | |||
421 | 409 | ||
422 | /* Allocate memory to store the user space buf */ | 410 | /* Allocate memory to store the user space buf */ |
423 | kern_buf = kzalloc(nbytes, GFP_KERNEL); | 411 | kern_buf = kzalloc(nbytes, GFP_KERNEL); |
424 | if (!kern_buf) { | 412 | if (!kern_buf) |
425 | pr_warn("bna %s: Failed to allocate user buffer\n", | ||
426 | pci_name(bnad->pcidev)); | ||
427 | return -ENOMEM; | 413 | return -ENOMEM; |
428 | } | ||
429 | 414 | ||
430 | if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) { | 415 | if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) { |
431 | kfree(kern_buf); | 416 | kfree(kern_buf); |