ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups

alloc failures already get standardized OOM
messages and a dump_stack.

Convert kzalloc's with multiplies to kcalloc.
Convert kmalloc's with multiplies to kmalloc_array.
Fix a few whitespace defects.
Convert a constant 6 to ETH_ALEN.
Use parentheses around sizeof.
Convert vmalloc/memset to vzalloc.
Remove now unused size variables.

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

4 files changed, 6 insertions, 14 deletions

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 3ba6be689e7d..c030274a70ab 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1518,10 +1518,8 @@ static void b44_setup_pseudo_magicp(struct b44 *bp)
         u8 pwol_mask[B44_PMASK_SIZE];
 
         pwol_pattern = kzalloc(B44_PATTERN_SIZE, GFP_KERNEL);
-        if (!pwol_pattern) {
-                pr_err("Memory not available for WOL\n");
+        if (!pwol_pattern)
                 return;
-        }
 
         /* Ipv4 magic packet pattern - pattern 0.*/
         memset(pwol_mask, 0, B44_PMASK_SIZE);
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index f5b6b4715d45..7d81e059e811 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -886,10 +886,9 @@ static int bcm_enet_open(struct net_device *dev)
         priv->tx_desc_alloc_size = size;
         priv->tx_desc_cpu = p;
 
-        priv->tx_skb = kzalloc(sizeof(struct sk_buff *) * priv->tx_ring_size,
+        priv->tx_skb = kcalloc(priv->tx_ring_size, sizeof(struct sk_buff *),
                                GFP_KERNEL);
         if (!priv->tx_skb) {
-                dev_err(kdev, "cannot allocate rx skb queue\n");
                 ret = -ENOMEM;
                 goto out_free_tx_ring;
         }
@@ -900,10 +899,9 @@ static int bcm_enet_open(struct net_device *dev)
         spin_lock_init(&priv->tx_lock);
 
         /* init & fill rx ring with skbs */
-        priv->rx_skb = kzalloc(sizeof(struct sk_buff *) * priv->rx_ring_size,
+        priv->rx_skb = kcalloc(priv->rx_ring_size, sizeof(struct sk_buff *),
                                GFP_KERNEL);
         if (!priv->rx_skb) {
-                dev_err(kdev, "cannot allocate rx skb queue\n");
                 ret = -ENOMEM;
                 goto out_free_tx_skb;
         }
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 1c4dadc7ebbb..149a3a038491 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -5425,11 +5425,9 @@ static struct cnic_dev *cnic_alloc_dev(struct net_device *dev,
 
         alloc_size = sizeof(struct cnic_dev) + sizeof(struct cnic_local);
 
-        cdev = kzalloc(alloc_size , GFP_KERNEL);
-        if (cdev == NULL) {
-                netdev_err(dev, "allocate dev struct failure\n");
+        cdev = kzalloc(alloc_size, GFP_KERNEL);
+        if (cdev == NULL)
                 return NULL;
-        }
 
         cdev->netdev = dev;
         cdev->cnic_priv = (char *)cdev + sizeof(struct cnic_dev);
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index ab07026a36e3..90195e324a64 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -5793,10 +5793,8 @@ static void tg3_dump_state(struct tg3 *tp)
         u32 *regs;
 
         regs = kzalloc(TG3_REG_BLK_SIZE, GFP_ATOMIC);
-        if (!regs) {
-                netdev_err(tp->dev, "Failed allocating register dump buffer\n");
+        if (!regs)
                 return;
-        }
 
         if (tg3_flag(tp, PCI_EXPRESS)) {
                 /* Read up to but not including private PCI registers */