renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
Code

scsi: lpfc: use dma_set_mask_and_coherent

Browse Source 
The driver currently uses pci_set_dma_mask despite otherwise using the
generic DMA API.  Switch it over to the better generic DMA API.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christoph Hellwig 2018-10-18 15:10:21 +02:00 committed by Martin K. Petersen
parent 52f603fee1
commit f30e1bfd61
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/scsi/lpfc/lpfc_init.c
View File

@ -7352,26 +7352,19 @@ lpfc_post_init_setup(struct lpfc_hba *phba)
static int static int
lpfc_sli_pci_mem_setup(struct lpfc_hba *phba) lpfc_sli_pci_mem_setup(struct lpfc_hba *phba)
{ {
struct pci_dev *pdev; struct pci_dev *pdev = phba->pcidev;
unsigned long bar0map_len, bar2map_len; unsigned long bar0map_len, bar2map_len;
int i, hbq_count; int i, hbq_count;
void *ptr; void *ptr;
int error = -ENODEV; int error = -ENODEV;
/* Obtain PCI device reference */ if (!pdev)
if (!phba->pcidev)
return error; return error;
else
pdev = phba->pcidev;
/* Set the device DMA mask size */ /* Set the device DMA mask size */
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0 if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
|| pci_set_consistent_dma_mask(pdev,DMA_BIT_MASK(64)) != 0) { dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0 return error;
|| pci_set_consistent_dma_mask(pdev,DMA_BIT_MASK(32)) != 0) {
return error;
}
}
/* Get the bus address of Bar0 and Bar2 and the number of bytes /* Get the bus address of Bar0 and Bar2 and the number of bytes
* required by each mapping. * required by each mapping.
@ -9735,25 +9728,18 @@ out:
static int static int
lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)
{ {
struct pci_dev *pdev; struct pci_dev *pdev = phba->pcidev;
unsigned long bar0map_len, bar1map_len, bar2map_len; unsigned long bar0map_len, bar1map_len, bar2map_len;
int error = -ENODEV; int error = -ENODEV;
uint32_t if_type; uint32_t if_type;
/* Obtain PCI device reference */ if (!pdev)
if (!phba->pcidev)
return error; return error;
else
pdev = phba->pcidev;
/* Set the device DMA mask size */ /* Set the device DMA mask size */
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0 if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||
|| pci_set_consistent_dma_mask(pdev,DMA_BIT_MASK(64)) != 0) { dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0 return error;
|| pci_set_consistent_dma_mask(pdev,DMA_BIT_MASK(32)) != 0) {
return error;
}
}
/* /*
* The BARs and register set definitions and offset locations are * The BARs and register set definitions and offset locations are