Commit 959c014f authored by ching Huang's avatar ching Huang Committed by Martin K. Petersen
Browse files

scsi: arcmsr: Deprecate using arcmsr_pci_unmap_dma() 



Stop using arcmsr_pci_unmap_dma() and call scsi_dma_unmap() directly.

Signed-off-by: default avatarching Huang <ching2048@areca.com.tw>
Link: https://lore.kernel.org/r/17c235f2fff960aefea33b50039e214f42164130.camel@areca.com.tw


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fe15c26e

drivers/scsi/arcmsr/arcmsr_hba.c

+2 −9
Original line number Diff line number Diff line
@@ -1300,20 +1300,13 @@ static uint8_t arcmsr_abort_allcmd(struct AdapterControlBlock *acb) 
	return rtnval;

}



static void arcmsr_pci_unmap_dma(struct CommandControlBlock *ccb)

{

	struct scsi_cmnd *pcmd = ccb->pcmd;



	scsi_dma_unmap(pcmd);

}



static void arcmsr_ccb_complete(struct CommandControlBlock *ccb)

{

	struct AdapterControlBlock *acb = ccb->acb;

	struct scsi_cmnd *pcmd = ccb->pcmd;

	unsigned long flags;

	atomic_dec(&acb->ccboutstandingcount);

	arcmsr_pci_unmap_dma(ccb);

	scsi_dma_unmap(ccb->pcmd);

	ccb->startdone = ARCMSR_CCB_DONE;

	spin_lock_irqsave(&acb->ccblist_lock, flags);

	list_add_tail(&ccb->list, &acb->ccb_free_list);
@@ -1597,7 +1590,7 @@ static void arcmsr_remove_scsi_devices(struct AdapterControlBlock *acb) 
		ccb = acb->pccb_pool[i];

		if (ccb->startdone == ARCMSR_CCB_START) {

			ccb->pcmd->result = DID_NO_CONNECT << 16;

			arcmsr_pci_unmap_dma(ccb);

			scsi_dma_unmap(ccb->pcmd);

			scsi_done(ccb->pcmd);

		}

	}