[PATCH 13/22] qlogic: Use pci_zalloc_consistent

[Joe Perches]

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <j...@perches.com>
---
 drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c |  4 +---
 drivers/net/ethernet/qlogic/qlge/qlge_main.c        | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c 
b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 6f6be57..b8d5270 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -129,14 +129,12 @@ netxen_get_minidump_template(struct netxen_adapter 
*adapter)
                return NX_RCODE_INVALID_ARGS;
        }
 
-       addr = pci_alloc_consistent(adapter->pdev, size, &md_template_addr);
-
+       addr = pci_zalloc_consistent(adapter->pdev, size, &md_template_addr);
        if (!addr) {
                dev_err(&adapter->pdev->dev, "Unable to allocate dmable memory 
for template.\n");
                return -ENOMEM;
        }
 
-       memset(addr, 0, size);
        memset(&cmd, 0, sizeof(cmd));
        memset(&cmd.rsp, 1, sizeof(struct _cdrp_cmd));
        cmd.req.cmd = NX_CDRP_CMD_GET_TEMP_HDR;
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c 
b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index b40050e..d836ace 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2727,23 +2727,22 @@ static void ql_free_shadow_space(struct ql_adapter 
*qdev)
 static int ql_alloc_shadow_space(struct ql_adapter *qdev)
 {
        qdev->rx_ring_shadow_reg_area =
-           pci_alloc_consistent(qdev->pdev,
-                                PAGE_SIZE, &qdev->rx_ring_shadow_reg_dma);
+               pci_zalloc_consistent(qdev->pdev, PAGE_SIZE,
+                                     &qdev->rx_ring_shadow_reg_dma);
        if (qdev->rx_ring_shadow_reg_area == NULL) {
                netif_err(qdev, ifup, qdev->ndev,
                          "Allocation of RX shadow space failed.\n");
                return -ENOMEM;
        }
-       memset(qdev->rx_ring_shadow_reg_area, 0, PAGE_SIZE);
+
        qdev->tx_ring_shadow_reg_area =
-           pci_alloc_consistent(qdev->pdev, PAGE_SIZE,
-                                &qdev->tx_ring_shadow_reg_dma);
+               pci_zalloc_consistent(qdev->pdev, PAGE_SIZE,
+                                     &qdev->tx_ring_shadow_reg_dma);
        if (qdev->tx_ring_shadow_reg_area == NULL) {
                netif_err(qdev, ifup, qdev->ndev,
                          "Allocation of TX shadow space failed.\n");
                goto err_wqp_sh_area;
        }
-       memset(qdev->tx_ring_shadow_reg_area, 0, PAGE_SIZE);
        return 0;
 
 err_wqp_sh_area:
-- 
1.8.1.2.459.gbcd45b4.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/