drivers: net: Remove remaining alloc/OOM messages

alloc failures already get standardized OOM
messages and a dump_stack.

For the affected mallocs around these OOM messages:

Converted kmallocs with multiplies to kmalloc_array.
Converted a kmalloc/memcpy to kmemdup.
Removed now unused stack variables.
Removed unnecessary parentheses.
Neatened alignment.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 75734bfed10f..ab32bd0be8ff 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -277,14 +277,12 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
         /* Setup the skbuff rings */
         for (i = 0; i < priv->num_tx_queues; i++) {
                 tx_queue = priv->tx_queue[i];
-                tx_queue->tx_skbuff = kmalloc(sizeof(*tx_queue->tx_skbuff) *
-                                              tx_queue->tx_ring_size,
-                                              GFP_KERNEL);
-                if (!tx_queue->tx_skbuff) {
-                        netif_err(priv, ifup, ndev,
-                                  "Could not allocate tx_skbuff\n");
+                tx_queue->tx_skbuff =
+                        kmalloc_array(tx_queue->tx_ring_size,
+                                      sizeof(*tx_queue->tx_skbuff),
+                                      GFP_KERNEL);
+                if (!tx_queue->tx_skbuff)
                         goto cleanup;
-                }
 
                 for (k = 0; k < tx_queue->tx_ring_size; k++)
                         tx_queue->tx_skbuff[k] = NULL;
@@ -292,15 +290,12 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
 
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_queue = priv->rx_queue[i];
-                rx_queue->rx_skbuff = kmalloc(sizeof(*rx_queue->rx_skbuff) *
-                                              rx_queue->rx_ring_size,
-                                              GFP_KERNEL);
-
-                if (!rx_queue->rx_skbuff) {
-                        netif_err(priv, ifup, ndev,
-                                  "Could not allocate rx_skbuff\n");
+                rx_queue->rx_skbuff =
+                        kmalloc_array(rx_queue->rx_ring_size,
+                                      sizeof(*rx_queue->rx_skbuff),
+                                      GFP_KERNEL);
+                if (!rx_queue->rx_skbuff)
                         goto cleanup;
-                }
 
                 for (j = 0; j < rx_queue->rx_ring_size; j++)
                         rx_queue->rx_skbuff[j] = NULL;