diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/bgmac.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index cabc8e49ad24..2d3a44c40221 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c | |||
| @@ -634,9 +634,9 @@ static int bgmac_dma_alloc(struct bgmac *bgmac) | |||
| 634 | 634 | ||
| 635 | /* Alloc ring of descriptors */ | 635 | /* Alloc ring of descriptors */ |
| 636 | size = BGMAC_TX_RING_SLOTS * sizeof(struct bgmac_dma_desc); | 636 | size = BGMAC_TX_RING_SLOTS * sizeof(struct bgmac_dma_desc); |
| 637 | ring->cpu_base = dma_zalloc_coherent(dma_dev, size, | 637 | ring->cpu_base = dma_alloc_coherent(dma_dev, size, |
| 638 | &ring->dma_base, | 638 | &ring->dma_base, |
| 639 | GFP_KERNEL); | 639 | GFP_KERNEL); |
| 640 | if (!ring->cpu_base) { | 640 | if (!ring->cpu_base) { |
| 641 | dev_err(bgmac->dev, "Allocation of TX ring 0x%X failed\n", | 641 | dev_err(bgmac->dev, "Allocation of TX ring 0x%X failed\n", |
| 642 | ring->mmio_base); | 642 | ring->mmio_base); |
| @@ -659,9 +659,9 @@ static int bgmac_dma_alloc(struct bgmac *bgmac) | |||
| 659 | 659 | ||
| 660 | /* Alloc ring of descriptors */ | 660 | /* Alloc ring of descriptors */ |
| 661 | size = BGMAC_RX_RING_SLOTS * sizeof(struct bgmac_dma_desc); | 661 | size = BGMAC_RX_RING_SLOTS * sizeof(struct bgmac_dma_desc); |
| 662 | ring->cpu_base = dma_zalloc_coherent(dma_dev, size, | 662 | ring->cpu_base = dma_alloc_coherent(dma_dev, size, |
| 663 | &ring->dma_base, | 663 | &ring->dma_base, |
| 664 | GFP_KERNEL); | 664 | GFP_KERNEL); |
| 665 | if (!ring->cpu_base) { | 665 | if (!ring->cpu_base) { |
| 666 | dev_err(bgmac->dev, "Allocation of RX ring 0x%X failed\n", | 666 | dev_err(bgmac->dev, "Allocation of RX ring 0x%X failed\n", |
| 667 | ring->mmio_base); | 667 | ring->mmio_base); |