diff options
| author | Joe Perches <joe@perches.com> | 2013-03-14 13:07:21 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-15 08:56:58 -0400 |
| commit | d0320f750093d012d3ed69fc1e8b385f654523d5 (patch) | |
| tree | 1f9c25c892c33275fb85a993e9a274dc5618370b /drivers/net/fddi | |
| parent | 68c45a2da34cb44962c6a48f8e474ec6b7853641 (diff) | |
| download | linux-stable-d0320f750093d012d3ed69fc1e8b385f654523d5.tar.gz linux-stable-d0320f750093d012d3ed69fc1e8b385f654523d5.tar.bz2 linux-stable-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/fddi')
| -rw-r--r-- | drivers/net/fddi/defxx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 502c8ff1d985..f116e51e3865 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c @@ -1071,11 +1071,9 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name, bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size, &bp->kmalloced_dma, GFP_ATOMIC); - if (top_v == NULL) { - printk("%s: Could not allocate memory for host buffers " - "and structures!\n", print_name); + if (top_v == NULL) return DFX_K_FAILURE; - } + memset(top_v, 0, alloc_size); /* zero out memory before continuing */ top_p = bp->kmalloced_dma; /* get physical address of buffer */ |