OSDN Git Service

scsi: arcmsr: Use dma_alloc_coherent to replace dma_zalloc_coherent
authorChing Huang <ching2048@areca.com.tw>
Fri, 18 Jan 2019 02:53:41 +0000 (10:53 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 23 Jan 2019 02:38:21 +0000 (21:38 -0500)
From Ching Huang <ching2048@areca.com.tw>

dma_zalloc_coherent will be phased out. Use dma_alloc_coherent instead.

Signed-off-by: Ching Huang <ching2048@areca.com.tw>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/arcmsr/arcmsr_hba.c

index 9f85d5a..5736434 100644 (file)
@@ -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);