diff options
Diffstat (limited to 'drivers/s390/net/ism_drv.c')
-rw-r--r-- | drivers/s390/net/ism_drv.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index dcbf5c857743..ed8e58f09054 100644 --- a/drivers/s390/net/ism_drv.c +++ b/drivers/s390/net/ism_drv.c | |||
@@ -89,8 +89,8 @@ static int register_sba(struct ism_dev *ism) | |||
89 | dma_addr_t dma_handle; | 89 | dma_addr_t dma_handle; |
90 | struct ism_sba *sba; | 90 | struct ism_sba *sba; |
91 | 91 | ||
92 | sba = dma_zalloc_coherent(&ism->pdev->dev, PAGE_SIZE, | 92 | sba = dma_alloc_coherent(&ism->pdev->dev, PAGE_SIZE, &dma_handle, |
93 | &dma_handle, GFP_KERNEL); | 93 | GFP_KERNEL); |
94 | if (!sba) | 94 | if (!sba) |
95 | return -ENOMEM; | 95 | return -ENOMEM; |
96 | 96 | ||
@@ -116,8 +116,8 @@ static int register_ieq(struct ism_dev *ism) | |||
116 | dma_addr_t dma_handle; | 116 | dma_addr_t dma_handle; |
117 | struct ism_eq *ieq; | 117 | struct ism_eq *ieq; |
118 | 118 | ||
119 | ieq = dma_zalloc_coherent(&ism->pdev->dev, PAGE_SIZE, | 119 | ieq = dma_alloc_coherent(&ism->pdev->dev, PAGE_SIZE, &dma_handle, |
120 | &dma_handle, GFP_KERNEL); | 120 | GFP_KERNEL); |
121 | if (!ieq) | 121 | if (!ieq) |
122 | return -ENOMEM; | 122 | return -ENOMEM; |
123 | 123 | ||
@@ -234,10 +234,9 @@ static int ism_alloc_dmb(struct ism_dev *ism, struct smcd_dmb *dmb) | |||
234 | test_and_set_bit(dmb->sba_idx, ism->sba_bitmap)) | 234 | test_and_set_bit(dmb->sba_idx, ism->sba_bitmap)) |
235 | return -EINVAL; | 235 | return -EINVAL; |
236 | 236 | ||
237 | dmb->cpu_addr = dma_zalloc_coherent(&ism->pdev->dev, dmb->dmb_len, | 237 | dmb->cpu_addr = dma_alloc_coherent(&ism->pdev->dev, dmb->dmb_len, |
238 | &dmb->dma_addr, GFP_KERNEL | | 238 | &dmb->dma_addr, |
239 | __GFP_NOWARN | __GFP_NOMEMALLOC | | 239 | GFP_KERNEL | __GFP_NOWARN | __GFP_NOMEMALLOC | __GFP_COMP | __GFP_NORETRY); |
240 | __GFP_COMP | __GFP_NORETRY); | ||
241 | if (!dmb->cpu_addr) | 240 | if (!dmb->cpu_addr) |
242 | clear_bit(dmb->sba_idx, ism->sba_bitmap); | 241 | clear_bit(dmb->sba_idx, ism->sba_bitmap); |
243 | 242 | ||