aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgb
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-14 09:07:21 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-15 08:56:58 -0400
commitd0320f750093d012d3ed69fc1e8b385f654523d5 (patch)
tree1f9c25c892c33275fb85a993e9a274dc5618370b /drivers/net/ethernet/intel/ixgb
parent68c45a2da34cb44962c6a48f8e474ec6b7853641 (diff)
drivers:net: Remove dma_alloc_coherent OOM messages
I believe these error messages are already logged on allocation failure by warn_alloc_failed and so get a dump_stack on OOM. Remove the unnecessary additional error logging. Around these deletions: o Alignment neatening. o Remove unnecessary casts of dma_alloc_coherent. o Hoist assigns from ifs. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgb')
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index ea4808373435..e23f0234cb27 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -720,8 +720,6 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
720 GFP_KERNEL); 720 GFP_KERNEL);
721 if (!txdr->desc) { 721 if (!txdr->desc) {
722 vfree(txdr->buffer_info); 722 vfree(txdr->buffer_info);
723 netif_err(adapter, probe, adapter->netdev,
724 "Unable to allocate transmit descriptor memory\n");
725 return -ENOMEM; 723 return -ENOMEM;
726 } 724 }
727 memset(txdr->desc, 0, txdr->size); 725 memset(txdr->desc, 0, txdr->size);
@@ -807,8 +805,6 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
807 805
808 if (!rxdr->desc) { 806 if (!rxdr->desc) {
809 vfree(rxdr->buffer_info); 807 vfree(rxdr->buffer_info);
810 netif_err(adapter, probe, adapter->netdev,
811 "Unable to allocate receive descriptors\n");
812 return -ENOMEM; 808 return -ENOMEM;
813 } 809 }
814 memset(rxdr->desc, 0, rxdr->size); 810 memset(rxdr->desc, 0, rxdr->size);