>From Ching Huang <ching2...@areca.com.tw>

Due to dma_zalloc_coherent will be phase out, so use dma_alloc_coherent to 
replace
 it.

Signed-off-by: Ching Huang <ching2...@areca.com.tw>
---

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 9f85d5a..5736434 100755
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -642,7 +642,7 @@ static bool arcmsr_alloc_io_queue(struct 
AdapterControlBlock *acb)
        switch (acb->adapter_type) {
        case ACB_ADAPTER_TYPE_B: {
                acb->ioqueue_size = roundup(sizeof(struct MessageUnit_B), 32);
-               dma_coherent = dma_zalloc_coherent(&pdev->dev, 
acb->ioqueue_size,
+               dma_coherent = dma_alloc_coherent(&pdev->dev, acb->ioqueue_size,
                        &dma_coherent_handle, GFP_KERNEL);
                if (!dma_coherent) {
                        pr_notice("arcmsr%d: DMA allocation failed\n", 
acb->host->host_no);
@@ -656,7 +656,7 @@ static bool arcmsr_alloc_io_queue(struct 
AdapterControlBlock *acb)
                break;
        case ACB_ADAPTER_TYPE_D: {
                acb->ioqueue_size = roundup(sizeof(struct MessageUnit_D), 32);
-               dma_coherent = dma_zalloc_coherent(&pdev->dev, 
acb->ioqueue_size,
+               dma_coherent = dma_alloc_coherent(&pdev->dev, acb->ioqueue_size,
                        &dma_coherent_handle, GFP_KERNEL);
                if (!dma_coherent) {
                        pr_notice("arcmsr%d: DMA allocation failed\n", 
acb->host->host_no);
@@ -672,7 +672,7 @@ static bool arcmsr_alloc_io_queue(struct 
AdapterControlBlock *acb)
                uint32_t completeQ_size;
                completeQ_size = sizeof(struct deliver_completeQ) * 
ARCMSR_MAX_HBE_DONEQUEUE + 128;
                acb->ioqueue_size = roundup(completeQ_size, 32);
-               dma_coherent = dma_zalloc_coherent(&pdev->dev, 
acb->ioqueue_size,
+               dma_coherent = dma_alloc_coherent(&pdev->dev, acb->ioqueue_size,
                        &dma_coherent_handle, GFP_KERNEL);
                if (!dma_coherent){
                        pr_notice("arcmsr%d: DMA allocation failed\n", 
acb->host->host_no);


Reply via email to