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/broadcom | |
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/broadcom')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 021fb818007a..0a4c5405dcf4 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -2625,10 +2625,8 @@ bnx2_alloc_bad_rbuf(struct bnx2 *bp) | |||
2625 | u32 val; | 2625 | u32 val; |
2626 | 2626 | ||
2627 | good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL); | 2627 | good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL); |
2628 | if (good_mbuf == NULL) { | 2628 | if (good_mbuf == NULL) |
2629 | pr_err("Failed to allocate memory in %s\n", __func__); | ||
2630 | return -ENOMEM; | 2629 | return -ENOMEM; |
2631 | } | ||
2632 | 2630 | ||
2633 | REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS, | 2631 | REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS, |
2634 | BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE); | 2632 | BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index fea961505391..582cbcf5f9fb 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -10894,10 +10894,8 @@ static inline void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n) | |||
10894 | do { \ | 10894 | do { \ |
10895 | u32 len = be32_to_cpu(fw_hdr->arr.len); \ | 10895 | u32 len = be32_to_cpu(fw_hdr->arr.len); \ |
10896 | bp->arr = kmalloc(len, GFP_KERNEL); \ | 10896 | bp->arr = kmalloc(len, GFP_KERNEL); \ |
10897 | if (!bp->arr) { \ | 10897 | if (!bp->arr) \ |
10898 | pr_err("Failed to allocate %d bytes for "#arr"\n", len); \ | ||
10899 | goto lbl; \ | 10898 | goto lbl; \ |
10900 | } \ | ||
10901 | func(bp->firmware->data + be32_to_cpu(fw_hdr->arr.offset), \ | 10899 | func(bp->firmware->data + be32_to_cpu(fw_hdr->arr.offset), \ |
10902 | (u8 *)bp->arr, len); \ | 10900 | (u8 *)bp->arr, len); \ |
10903 | } while (0) | 10901 | } while (0) |