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/irda/smsc-ircc2.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/irda/smsc-ircc2.c')
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 5290952b60c2..59b45c10adbc 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -564,20 +564,14 @@ static int smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma, | |||
564 | self->rx_buff.head = | 564 | self->rx_buff.head = |
565 | dma_alloc_coherent(NULL, self->rx_buff.truesize, | 565 | dma_alloc_coherent(NULL, self->rx_buff.truesize, |
566 | &self->rx_buff_dma, GFP_KERNEL); | 566 | &self->rx_buff_dma, GFP_KERNEL); |
567 | if (self->rx_buff.head == NULL) { | 567 | if (self->rx_buff.head == NULL) |
568 | IRDA_ERROR("%s, Can't allocate memory for receive buffer!\n", | ||
569 | driver_name); | ||
570 | goto err_out2; | 568 | goto err_out2; |
571 | } | ||
572 | 569 | ||
573 | self->tx_buff.head = | 570 | self->tx_buff.head = |
574 | dma_alloc_coherent(NULL, self->tx_buff.truesize, | 571 | dma_alloc_coherent(NULL, self->tx_buff.truesize, |
575 | &self->tx_buff_dma, GFP_KERNEL); | 572 | &self->tx_buff_dma, GFP_KERNEL); |
576 | if (self->tx_buff.head == NULL) { | 573 | if (self->tx_buff.head == NULL) |
577 | IRDA_ERROR("%s, Can't allocate memory for transmit buffer!\n", | ||
578 | driver_name); | ||
579 | goto err_out3; | 574 | goto err_out3; |
580 | } | ||
581 | 575 | ||
582 | memset(self->rx_buff.head, 0, self->rx_buff.truesize); | 576 | memset(self->rx_buff.head, 0, self->rx_buff.truesize); |
583 | memset(self->tx_buff.head, 0, self->tx_buff.truesize); | 577 | memset(self->tx_buff.head, 0, self->tx_buff.truesize); |