diff options
| author | Joe Perches | 2013-03-14 14:07:21 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-03-15 13:56:58 +0100 |
| commit | d0320f750093d012d3ed69fc1e8b385f654523d5 (patch) | |
| tree | 1f9c25c892c33275fb85a993e9a274dc5618370b /drivers/net/ethernet/tundra/tsi108_eth.c | |
| parent | be2net: Use new F/W mailbox cmd to manipulate interrupts. (diff) | |
| download | kernel-qcow2-linux-d0320f750093d012d3ed69fc1e8b385f654523d5.tar.gz kernel-qcow2-linux-d0320f750093d012d3ed69fc1e8b385f654523d5.tar.xz kernel-qcow2-linux-d0320f750093d012d3ed69fc1e8b385f654523d5.zip | |
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/tundra/tsi108_eth.c')
| -rw-r--r-- | drivers/net/ethernet/tundra/tsi108_eth.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c index 8fa947a2d929..99fe3c6eea31 100644 --- a/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/drivers/net/ethernet/tundra/tsi108_eth.c @@ -1309,22 +1309,16 @@ static int tsi108_open(struct net_device *dev) } data->rxring = dma_alloc_coherent(NULL, rxring_size, - &data->rxdma, GFP_KERNEL); - + &data->rxdma, GFP_KERNEL); if (!data->rxring) { - printk(KERN_DEBUG - "TSI108_ETH: failed to allocate memory for rxring!\n"); return -ENOMEM; } else { memset(data->rxring, 0, rxring_size); } data->txring = dma_alloc_coherent(NULL, txring_size, - &data->txdma, GFP_KERNEL); - + &data->txdma, GFP_KERNEL); if (!data->txring) { - printk(KERN_DEBUG - "TSI108_ETH: failed to allocate memory for txring!\n"); pci_free_consistent(0, rxring_size, data->rxring, data->rxdma); return -ENOMEM; } else { |