diff options
Diffstat (limited to 'drivers/ata/sata_mv.c')
| -rw-r--r-- | drivers/ata/sata_mv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 0281785c7a28..bd74ee555278 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -4320,10 +4320,10 @@ static int pci_go_64(struct pci_dev *pdev) | |||
| 4320 | { | 4320 | { |
| 4321 | int rc; | 4321 | int rc; |
| 4322 | 4322 | ||
| 4323 | if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { | 4323 | if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { |
| 4324 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); | 4324 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); |
| 4325 | if (rc) { | 4325 | if (rc) { |
| 4326 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); | 4326 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 4327 | if (rc) { | 4327 | if (rc) { |
| 4328 | dev_err(&pdev->dev, | 4328 | dev_err(&pdev->dev, |
| 4329 | "64-bit DMA enable failed\n"); | 4329 | "64-bit DMA enable failed\n"); |
| @@ -4331,12 +4331,12 @@ static int pci_go_64(struct pci_dev *pdev) | |||
| 4331 | } | 4331 | } |
| 4332 | } | 4332 | } |
| 4333 | } else { | 4333 | } else { |
| 4334 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); | 4334 | rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 4335 | if (rc) { | 4335 | if (rc) { |
| 4336 | dev_err(&pdev->dev, "32-bit DMA enable failed\n"); | 4336 | dev_err(&pdev->dev, "32-bit DMA enable failed\n"); |
| 4337 | return rc; | 4337 | return rc; |
| 4338 | } | 4338 | } |
| 4339 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); | 4339 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 4340 | if (rc) { | 4340 | if (rc) { |
| 4341 | dev_err(&pdev->dev, | 4341 | dev_err(&pdev->dev, |
| 4342 | "32-bit consistent DMA enable failed\n"); | 4342 | "32-bit consistent DMA enable failed\n"); |