diff options
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_main.c')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 852f5bfe5f6d..d5026909dec5 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
| @@ -167,8 +167,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q, | |||
| 167 | q->len = len; | 167 | q->len = len; |
| 168 | q->entry_size = entry_size; | 168 | q->entry_size = entry_size; |
| 169 | mem->size = len * entry_size; | 169 | mem->size = len * entry_size; |
| 170 | mem->va = dma_zalloc_coherent(&adapter->pdev->dev, mem->size, &mem->dma, | 170 | mem->va = dma_alloc_coherent(&adapter->pdev->dev, mem->size, |
| 171 | GFP_KERNEL); | 171 | &mem->dma, GFP_KERNEL); |
| 172 | if (!mem->va) | 172 | if (!mem->va) |
| 173 | return -ENOMEM; | 173 | return -ENOMEM; |
| 174 | return 0; | 174 | return 0; |
| @@ -5766,9 +5766,9 @@ static int be_drv_init(struct be_adapter *adapter) | |||
| 5766 | int status = 0; | 5766 | int status = 0; |
| 5767 | 5767 | ||
| 5768 | mbox_mem_alloc->size = sizeof(struct be_mcc_mailbox) + 16; | 5768 | mbox_mem_alloc->size = sizeof(struct be_mcc_mailbox) + 16; |
| 5769 | mbox_mem_alloc->va = dma_zalloc_coherent(dev, mbox_mem_alloc->size, | 5769 | mbox_mem_alloc->va = dma_alloc_coherent(dev, mbox_mem_alloc->size, |
| 5770 | &mbox_mem_alloc->dma, | 5770 | &mbox_mem_alloc->dma, |
| 5771 | GFP_KERNEL); | 5771 | GFP_KERNEL); |
| 5772 | if (!mbox_mem_alloc->va) | 5772 | if (!mbox_mem_alloc->va) |
| 5773 | return -ENOMEM; | 5773 | return -ENOMEM; |
| 5774 | 5774 | ||
| @@ -5777,8 +5777,8 @@ static int be_drv_init(struct be_adapter *adapter) | |||
| 5777 | mbox_mem_align->dma = PTR_ALIGN(mbox_mem_alloc->dma, 16); | 5777 | mbox_mem_align->dma = PTR_ALIGN(mbox_mem_alloc->dma, 16); |
| 5778 | 5778 | ||
| 5779 | rx_filter->size = sizeof(struct be_cmd_req_rx_filter); | 5779 | rx_filter->size = sizeof(struct be_cmd_req_rx_filter); |
| 5780 | rx_filter->va = dma_zalloc_coherent(dev, rx_filter->size, | 5780 | rx_filter->va = dma_alloc_coherent(dev, rx_filter->size, |
| 5781 | &rx_filter->dma, GFP_KERNEL); | 5781 | &rx_filter->dma, GFP_KERNEL); |
| 5782 | if (!rx_filter->va) { | 5782 | if (!rx_filter->va) { |
| 5783 | status = -ENOMEM; | 5783 | status = -ENOMEM; |
| 5784 | goto free_mbox; | 5784 | goto free_mbox; |
| @@ -5792,8 +5792,8 @@ static int be_drv_init(struct be_adapter *adapter) | |||
| 5792 | stats_cmd->size = sizeof(struct be_cmd_req_get_stats_v1); | 5792 | stats_cmd->size = sizeof(struct be_cmd_req_get_stats_v1); |
| 5793 | else | 5793 | else |
| 5794 | stats_cmd->size = sizeof(struct be_cmd_req_get_stats_v2); | 5794 | stats_cmd->size = sizeof(struct be_cmd_req_get_stats_v2); |
| 5795 | stats_cmd->va = dma_zalloc_coherent(dev, stats_cmd->size, | 5795 | stats_cmd->va = dma_alloc_coherent(dev, stats_cmd->size, |
| 5796 | &stats_cmd->dma, GFP_KERNEL); | 5796 | &stats_cmd->dma, GFP_KERNEL); |
| 5797 | if (!stats_cmd->va) { | 5797 | if (!stats_cmd->va) { |
| 5798 | status = -ENOMEM; | 5798 | status = -ENOMEM; |
| 5799 | goto free_rx_filter; | 5799 | goto free_rx_filter; |
