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, 17 insertions, 38 deletions

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 7f556a84925d..1bcaf45aa864 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -201,11 +201,8 @@ netxen_setup_minidump(struct netxen_adapter *adapter)
         adapter->mdump.md_template =
                 kmalloc(adapter->mdump.md_template_size, GFP_KERNEL);
 
-        if (!adapter->mdump.md_template) {
-                dev_err(&adapter->pdev->dev, "Unable to allocate memory "
-                        "for minidump template.\n");
+        if (!adapter->mdump.md_template)
                 return -ENOMEM;
-        }
 
         err = netxen_get_minidump_template(adapter);
         if (err) {
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index 946160fa5843..9fbb1cdbfa47 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -670,11 +670,9 @@ static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
         }
 
         cur = kzalloc(sizeof(nx_mac_list_t), GFP_ATOMIC);
-        if (cur == NULL) {
-                printk(KERN_ERR "%s: failed to add mac address filter\n",
-                                adapter->netdev->name);
+        if (cur == NULL)
                 return -ENOMEM;
-        }
+
         memcpy(cur->mac_addr, addr, ETH_ALEN);
         list_add_tail(&cur->list, &adapter->mac_list);
         return nx_p3_sre_macaddr_change(adapter,
@@ -2568,16 +2566,10 @@ netxen_dump_fw(struct netxen_adapter *adapter)
                                         adapter->mdump.md_capture_size;
         if (!adapter->mdump.md_capture_buff) {
                 adapter->mdump.md_capture_buff =
-                                vmalloc(adapter->mdump.md_dump_size);
-                if (!adapter->mdump.md_capture_buff) {
-                        dev_info(&adapter->pdev->dev,
-                                "Unable to allocate memory for minidump "
-                                "capture_buffer(%d bytes).\n",
-                                        adapter->mdump.md_dump_size);
+                                vzalloc(adapter->mdump.md_dump_size);
+                if (!adapter->mdump.md_capture_buff)
                         return;
-                }
-                memset(adapter->mdump.md_capture_buff, 0,
-                                adapter->mdump.md_dump_size);
+
                 if (netxen_collect_minidump(adapter)) {
                         adapter->mdump.has_valid_dump = 0;
                         adapter->mdump.md_dump_size = 0;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 695667d471a1..db50598006ef 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -197,41 +197,34 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
         struct nx_host_sds_ring *sds_ring;
         struct nx_host_tx_ring *tx_ring;
         struct netxen_rx_buffer *rx_buf;
-        int ring, i, size;
+        int ring, i;
 
         struct netxen_cmd_buffer *cmd_buf_arr;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
 
-        size = sizeof(struct nx_host_tx_ring);
-        tx_ring = kzalloc(size, GFP_KERNEL);
-        if (tx_ring == NULL) {
-                dev_err(&pdev->dev, "%s: failed to allocate tx ring struct\n",
-                       netdev->name);
+        tx_ring = kzalloc(sizeof(struct nx_host_tx_ring), GFP_KERNEL);
+        if (tx_ring == NULL)
                 return -ENOMEM;
-        }
+
         adapter->tx_ring = tx_ring;
 
         tx_ring->num_desc = adapter->num_txd;
         tx_ring->txq = netdev_get_tx_queue(netdev, 0);
 
         cmd_buf_arr = vzalloc(TX_BUFF_RINGSIZE(tx_ring));
-        if (cmd_buf_arr == NULL) {
-                dev_err(&pdev->dev, "%s: failed to allocate cmd buffer ring\n",
-                       netdev->name);
+        if (cmd_buf_arr == NULL)
                 goto err_out;
-        }
+
         tx_ring->cmd_buf_arr = cmd_buf_arr;
 
         recv_ctx = &adapter->recv_ctx;
 
-        size = adapter->max_rds_rings * sizeof (struct nx_host_rds_ring);
-        rds_ring = kzalloc(size, GFP_KERNEL);
-        if (rds_ring == NULL) {
-                dev_err(&pdev->dev, "%s: failed to allocate rds ring struct\n",
-                       netdev->name);
+        rds_ring = kcalloc(adapter->max_rds_rings,
+                           sizeof(struct nx_host_rds_ring), GFP_KERNEL);
+        if (rds_ring == NULL)
                 goto err_out;
-        }
+
         recv_ctx->rds_rings = rds_ring;
 
         for (ring = 0; ring < adapter->max_rds_rings; ring++) {
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 7a849fc55a66..501f49207da5 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -3176,11 +3176,8 @@ netxen_list_config_vlan_ip(struct netxen_adapter *adapter,
                 }
 
                 cur = kzalloc(sizeof(struct nx_vlan_ip_list), GFP_ATOMIC);
-                if (cur == NULL) {
-                        printk(KERN_ERR "%s: failed to add vlan ip to list\n",
-                                        adapter->netdev->name);
+                if (cur == NULL)
                         return;
-                }
 
                 cur->ip_addr = ifa->ifa_address;
                 list_add_tail(&cur->list, &adapter->vlan_ip_list);