aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sil24.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/sata_sil24.c')
-rw-r--r--drivers/ata/sata_sil24.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index ba2667fa0528..4b1995e2d044 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -246,7 +246,7 @@ enum {
246 /* host flags */ 246 /* host flags */
247 SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | 247 SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |
248 ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA | 248 ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA |
249 ATA_FLAG_AN | ATA_FLAG_PMP | ATA_FLAG_LOWTAG, 249 ATA_FLAG_AN | ATA_FLAG_PMP,
250 SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ 250 SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */
251 251
252 IRQ_STAT_4PORTS = 0xf, 252 IRQ_STAT_4PORTS = 0xf,
@@ -1312,10 +1312,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1312 host->iomap = iomap; 1312 host->iomap = iomap;
1313 1313
1314 /* configure and activate the device */ 1314 /* configure and activate the device */
1315 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { 1315 if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
1316 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); 1316 rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
1317 if (rc) { 1317 if (rc) {
1318 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); 1318 rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
1319 if (rc) { 1319 if (rc) {
1320 dev_err(&pdev->dev, 1320 dev_err(&pdev->dev,
1321 "64-bit DMA enable failed\n"); 1321 "64-bit DMA enable failed\n");
@@ -1323,12 +1323,12 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1323 } 1323 }
1324 } 1324 }
1325 } else { 1325 } else {
1326 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); 1326 rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
1327 if (rc) { 1327 if (rc) {
1328 dev_err(&pdev->dev, "32-bit DMA enable failed\n"); 1328 dev_err(&pdev->dev, "32-bit DMA enable failed\n");
1329 return rc; 1329 return rc;
1330 } 1330 }
1331 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); 1331 rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
1332 if (rc) { 1332 if (rc) {
1333 dev_err(&pdev->dev, 1333 dev_err(&pdev->dev,
1334 "32-bit consistent DMA enable failed\n"); 1334 "32-bit consistent DMA enable failed\n");