diff options
author | Christoph Hellwig <hch@lst.de> | 2018-10-10 13:59:50 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-10-17 21:58:52 -0400 |
commit | f73bdebdf020a31ad43ce4de590ec7a09e383abd (patch) | |
tree | e208c83cd5d4dad081fcf5694c73c3111bfb7546 /drivers/scsi/pm8001/pm8001_sas.c | |
parent | 03676e1d31fa0e156df0caecbacf20b488f7bd3a (diff) |
scsi: pm8001: switch to generic DMA API
Switch from the legacy PCI DMA API to the generic DMA API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Jack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
-rw-r--r-- | drivers/scsi/pm8001/pm8001_sas.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 84092e4e1aa9..b3be49d41375 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c | |||
@@ -116,8 +116,8 @@ int pm8001_mem_alloc(struct pci_dev *pdev, void **virt_addr, | |||
116 | u64 align_offset = 0; | 116 | u64 align_offset = 0; |
117 | if (align) | 117 | if (align) |
118 | align_offset = (dma_addr_t)align - 1; | 118 | align_offset = (dma_addr_t)align - 1; |
119 | mem_virt_alloc = pci_zalloc_consistent(pdev, mem_size + align, | 119 | mem_virt_alloc = dma_zalloc_coherent(&pdev->dev, mem_size + align, |
120 | &mem_dma_handle); | 120 | &mem_dma_handle, GFP_KERNEL); |
121 | if (!mem_virt_alloc) { | 121 | if (!mem_virt_alloc) { |
122 | pm8001_printk("memory allocation error\n"); | 122 | pm8001_printk("memory allocation error\n"); |
123 | return -1; | 123 | return -1; |
@@ -533,9 +533,9 @@ void pm8001_ccb_task_free(struct pm8001_hba_info *pm8001_ha, | |||
533 | switch (task->task_proto) { | 533 | switch (task->task_proto) { |
534 | case SAS_PROTOCOL_SMP: | 534 | case SAS_PROTOCOL_SMP: |
535 | dma_unmap_sg(pm8001_ha->dev, &task->smp_task.smp_resp, 1, | 535 | dma_unmap_sg(pm8001_ha->dev, &task->smp_task.smp_resp, 1, |
536 | PCI_DMA_FROMDEVICE); | 536 | DMA_FROM_DEVICE); |
537 | dma_unmap_sg(pm8001_ha->dev, &task->smp_task.smp_req, 1, | 537 | dma_unmap_sg(pm8001_ha->dev, &task->smp_task.smp_req, 1, |
538 | PCI_DMA_TODEVICE); | 538 | DMA_TO_DEVICE); |
539 | break; | 539 | break; |
540 | 540 | ||
541 | case SAS_PROTOCOL_SATA: | 541 | case SAS_PROTOCOL_SATA: |