Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e3153b0 authored by Ching Huang's avatar Ching Huang Committed by Martin K. Petersen
Browse files

scsi: arcmsr: Use dma_alloc_coherent to replace dma_zalloc_coherent 



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

dma_zalloc_coherent will be phased out. Use dma_alloc_coherent instead.

Signed-off-by: default avatarChing Huang <ching2048@areca.com.tw>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f03dc9cf

drivers/scsi/arcmsr/arcmsr_hba.c

+3 −3
Original line number Diff line number Diff line
@@ -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);