diff options
author | Joe Perches <joe@perches.com> | 2013-03-14 09:07:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-15 08:56:58 -0400 |
commit | d0320f750093d012d3ed69fc1e8b385f654523d5 (patch) | |
tree | 1f9c25c892c33275fb85a993e9a274dc5618370b /drivers/net/wireless/b43legacy/dma.c | |
parent | 68c45a2da34cb44962c6a48f8e474ec6b7853641 (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/wireless/b43legacy/dma.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index 2d3c6644f82d..07d7e928eac7 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c | |||
@@ -335,11 +335,8 @@ static int alloc_ringmemory(struct b43legacy_dmaring *ring) | |||
335 | B43legacy_DMA_RINGMEMSIZE, | 335 | B43legacy_DMA_RINGMEMSIZE, |
336 | &(ring->dmabase), | 336 | &(ring->dmabase), |
337 | GFP_KERNEL); | 337 | GFP_KERNEL); |
338 | if (!ring->descbase) { | 338 | if (!ring->descbase) |
339 | b43legacyerr(ring->dev->wl, "DMA ringmemory allocation" | ||
340 | " failed\n"); | ||
341 | return -ENOMEM; | 339 | return -ENOMEM; |
342 | } | ||
343 | memset(ring->descbase, 0, B43legacy_DMA_RINGMEMSIZE); | 340 | memset(ring->descbase, 0, B43legacy_DMA_RINGMEMSIZE); |
344 | 341 | ||
345 | return 0; | 342 | return 0; |