diff options
author | Joe Perches <joe@perches.com> | 2013-03-08 10:03:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-09 16:09:19 -0500 |
commit | 720a43efd30f04a0a492c85fb997361c44fbae05 (patch) | |
tree | 430e9488e00413655b7947f67e82c4fd2c07e951 /drivers/net/ethernet/ibm | |
parent | e8f83e5ec7450b85b101a774e165e70a18e9c3ab (diff) |
drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb
Emitting netdev_alloc_skb and netdev_alloc_skb_ip_align OOM
messages is unnecessary as there is already a dump_stack
after allocation failures.
Other trivial changes around these removals:
Convert a few comparisons of pointer to 0 to !pointer.
Change flow to remove unnecessary label.
Remove now unused variable.
Hoist assignment from if.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 328f47c92e26..029633434474 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -402,7 +402,6 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes) | |||
402 | skb_arr_rq1[index] = netdev_alloc_skb(dev, | 402 | skb_arr_rq1[index] = netdev_alloc_skb(dev, |
403 | EHEA_L_PKT_SIZE); | 403 | EHEA_L_PKT_SIZE); |
404 | if (!skb_arr_rq1[index]) { | 404 | if (!skb_arr_rq1[index]) { |
405 | netdev_info(dev, "Unable to allocate enough skb in the array\n"); | ||
406 | pr->rq1_skba.os_skbs = fill_wqes - i; | 405 | pr->rq1_skba.os_skbs = fill_wqes - i; |
407 | break; | 406 | break; |
408 | } | 407 | } |
@@ -432,10 +431,8 @@ static void ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a) | |||
432 | 431 | ||
433 | for (i = 0; i < nr_rq1a; i++) { | 432 | for (i = 0; i < nr_rq1a; i++) { |
434 | skb_arr_rq1[i] = netdev_alloc_skb(dev, EHEA_L_PKT_SIZE); | 433 | skb_arr_rq1[i] = netdev_alloc_skb(dev, EHEA_L_PKT_SIZE); |
435 | if (!skb_arr_rq1[i]) { | 434 | if (!skb_arr_rq1[i]) |
436 | netdev_info(dev, "Not enough memory to allocate skb array\n"); | ||
437 | break; | 435 | break; |
438 | } | ||
439 | } | 436 | } |
440 | /* Ring doorbell */ | 437 | /* Ring doorbell */ |
441 | ehea_update_rq1a(pr->qp, i - 1); | 438 | ehea_update_rq1a(pr->qp, i - 1); |
@@ -695,10 +692,8 @@ static int ehea_proc_rwqes(struct net_device *dev, | |||
695 | 692 | ||
696 | skb = netdev_alloc_skb(dev, | 693 | skb = netdev_alloc_skb(dev, |
697 | EHEA_L_PKT_SIZE); | 694 | EHEA_L_PKT_SIZE); |
698 | if (!skb) { | 695 | if (!skb) |
699 | netdev_err(dev, "Not enough memory to allocate skb\n"); | ||
700 | break; | 696 | break; |
701 | } | ||
702 | } | 697 | } |
703 | skb_copy_to_linear_data(skb, ((char *)cqe) + 64, | 698 | skb_copy_to_linear_data(skb, ((char *)cqe) + 64, |
704 | cqe->num_bytes_transfered - 4); | 699 | cqe->num_bytes_transfered - 4); |