scsi: arcmsr: Deprecate using arcmsr_pci_unmap_dma()
authorching Huang <ching2048@areca.com.tw>
Wed, 22 Mar 2023 17:07:47 +0000 (01:07 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 24 Mar 2023 21:51:55 +0000 (17:51 -0400)
Stop using arcmsr_pci_unmap_dma() and call scsi_dma_unmap() directly.

Signed-off-by: ching Huang <ching2048@areca.com.tw>
Link: https://lore.kernel.org/r/17c235f2fff960aefea33b50039e214f42164130.camel@areca.com.tw
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/arcmsr/arcmsr_hba.c

index d3fb8a9c1c3924696cef4e47df878446c66c0153..603860959c5ff623937c96815593b492eb499a1d 100644 (file)
@@ -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);
                }
        }