drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

Reduce the number of calls required to alloc
a zeroed block of memory.

Trivially reduces overall object size.

Other changes around these removals
o Neaten call argument alignment
o Remove an unnecessary OOM message after dma_alloc_coherent failure
o Remove unnecessary gfp_t stack variable

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 12 insertions, 24 deletions

diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 9cea451a6081..3adb43ce138f 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -352,21 +352,19 @@ static int ali_ircc_open(int i, chipio_t *info)
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out2;
         }
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
         
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out3;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 2a4f2f153244..9cf836b57c49 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -431,22 +431,20 @@ static int __init nsc_ircc_open(chipio_t *info)
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto out2;
 
         }
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
         
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto out3;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 858de05bdb7d..964b116a0ab7 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -700,12 +700,12 @@ static int pxa_irda_start(struct net_device *dev)
 
         err = -ENOMEM;
         si->dma_rx_buff = dma_alloc_coherent(si->dev, IRDA_FRAME_SIZE_LIMIT,
-                                             &si->dma_rx_buff_phy, GFP_KERNEL );
+                                             &si->dma_rx_buff_phy, GFP_KERNEL);
         if (!si->dma_rx_buff)
                 goto err_dma_rx_buff;
 
         si->dma_tx_buff = dma_alloc_coherent(si->dev, IRDA_FRAME_SIZE_LIMIT,
-                                             &si->dma_tx_buff_phy, GFP_KERNEL );
+                                             &si->dma_tx_buff_phy, GFP_KERNEL);
         if (!si->dma_tx_buff)
                 goto err_dma_tx_buff;
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 59b45c10adbc..aa05dad75335 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -563,19 +563,16 @@ static int smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma,
 
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL)
                 goto err_out2;
 
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL)
                 goto err_out3;
 
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
-
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
         self->tx_buff.data = self->tx_buff.head;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index f9033c6a888c..51f2bc376101 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -364,21 +364,19 @@ static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id)
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(&pdev->dev, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out2;
         }
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
 
         self->tx_buff.head =
                 dma_alloc_coherent(&pdev->dev, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out3;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index f5bb92f15880..bb8857a158a6 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -216,22 +216,19 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
         /* Allocate memory if needed */
         self->rx_buff.head =
                 dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                   &self->rx_buff_dma, GFP_KERNEL);
+                                   &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->rx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out1;
         }
 
-        memset(self->rx_buff.head, 0, self->rx_buff.truesize);
-        
         self->tx_buff.head =
                 dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                   &self->tx_buff_dma, GFP_KERNEL);
+                                   &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
         if (self->tx_buff.head == NULL) {
                 err = -ENOMEM;
                 goto err_out2;
         }
-        memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
         self->rx_buff.in_frame = FALSE;
         self->rx_buff.state = OUTSIDE_FRAME;