The patch titled
Subject: qlogic: use pci_zalloc_consistent
has been removed from the -mm tree. Its filename was
qlogic-use-pci_zalloc_consistent.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: qlogic: use pci_zalloc_consistent
Remove the now unnecessary memset too.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Manish Chopra <manish.chopra@xxxxxxxxxx>
Cc: Sony Chacko <sony.chacko@xxxxxxxxxx>
Cc: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Cc: Shahed Shaikh <shahed.shaikh@xxxxxxxxxx>
Cc: Jitendra Kalsaria <jitendra.kalsaria@xxxxxxxxxx>
Cc: Ron Mercer <ron.mercer@xxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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 -puN drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c~qlogic-use-pci_zalloc_consistent drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c~qlogic-use-pci_zalloc_consistent
+++ a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -129,14 +129,12 @@ netxen_get_minidump_template(struct netx
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 -puN drivers/net/ethernet/qlogic/qlge/qlge_main.c~qlogic-use-pci_zalloc_consistent drivers/net/ethernet/qlogic/qlge/qlge_main.c
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c~qlogic-use-pci_zalloc_consistent
+++ a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2727,23 +2727,22 @@ static void ql_free_shadow_space(struct
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:
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
origin.patch
mm-utilc-add-kstrimdup.patch
fs-isofs-logging-clean-up.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
