diff options
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 33bb06e006c9..c7a92a743ed0 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -738,10 +738,10 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) | |||
| 738 | return 0; | 738 | return 0; |
| 739 | 739 | ||
| 740 | if (using_dac && | 740 | if (using_dac && |
| 741 | !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { | 741 | !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { |
| 742 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); | 742 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); |
| 743 | if (rc) { | 743 | if (rc) { |
| 744 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); | 744 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 745 | if (rc) { | 745 | if (rc) { |
| 746 | dev_err(&pdev->dev, | 746 | dev_err(&pdev->dev, |
| 747 | "64-bit DMA enable failed\n"); | 747 | "64-bit DMA enable failed\n"); |
| @@ -749,12 +749,12 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) | |||
| 749 | } | 749 | } |
| 750 | } | 750 | } |
| 751 | } else { | 751 | } else { |
| 752 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); | 752 | rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 753 | if (rc) { | 753 | if (rc) { |
| 754 | dev_err(&pdev->dev, "32-bit DMA enable failed\n"); | 754 | dev_err(&pdev->dev, "32-bit DMA enable failed\n"); |
| 755 | return rc; | 755 | return rc; |
| 756 | } | 756 | } |
| 757 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); | 757 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 758 | if (rc) { | 758 | if (rc) { |
| 759 | dev_err(&pdev->dev, | 759 | dev_err(&pdev->dev, |
| 760 | "32-bit consistent DMA enable failed\n"); | 760 | "32-bit consistent DMA enable failed\n"); |