diff options
author | YueHaibing <yuehaibing@huawei.com> | 2018-07-19 10:04:07 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-08-24 11:52:35 -0400 |
commit | a9910c0886470b659a6c3629d6467d5639c327e9 (patch) | |
tree | fb77f14ff35c3f49cdc7eaae4dc197fbe8139d63 | |
parent | ff0fadfffe681203bfe134e1041ab6ccb4aa3dff (diff) |
ixgb: use dma_zalloc_coherent instead of allocator/memset
Use dma_zalloc_coherent instead of dma_alloc_coherent
followed by memset 0.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 43664adf7a3c..d3e72d0f66ef 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -771,14 +771,13 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter) | |||
771 | rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc); | 771 | rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc); |
772 | rxdr->size = ALIGN(rxdr->size, 4096); | 772 | rxdr->size = ALIGN(rxdr->size, 4096); |
773 | 773 | ||
774 | rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, | 774 | rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, |
775 | GFP_KERNEL); | 775 | GFP_KERNEL); |
776 | 776 | ||
777 | if (!rxdr->desc) { | 777 | if (!rxdr->desc) { |
778 | vfree(rxdr->buffer_info); | 778 | vfree(rxdr->buffer_info); |
779 | return -ENOMEM; | 779 | return -ENOMEM; |
780 | } | 780 | } |
781 | memset(rxdr->desc, 0, rxdr->size); | ||
782 | 781 | ||
783 | rxdr->next_to_clean = 0; | 782 | rxdr->next_to_clean = 0; |
784 | rxdr->next_to_use = 0; | 783 | rxdr->next_to_use = 0; |