aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sil.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/sata_sil.c')
-rw-r--r--drivers/ata/sata_sil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 659dfcbdc1b2..987313b68f3b 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -410,10 +410,10 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
410 goto err_hsm; 410 goto err_hsm;
411 411
412 /* ack bmdma irq events */ 412 /* ack bmdma irq events */
413 ata_bmdma_irq_clear(ap); 413 ata_sff_irq_clear(ap);
414 414
415 /* kick HSM in the ass */ 415 /* kick HSM in the ass */
416 ata_hsm_move(ap, qc, status, 0); 416 ata_sff_hsm_move(ap, qc, status, 0);
417 417
418 if (unlikely(qc->err_mask) && ata_is_dma(qc->tf.protocol)) 418 if (unlikely(qc->err_mask) && ata_is_dma(qc->tf.protocol))
419 ata_ehi_push_desc(ehi, "BMDMA2 stat 0x%x", bmdma2); 419 ata_ehi_push_desc(ehi, "BMDMA2 stat 0x%x", bmdma2);
@@ -481,7 +481,7 @@ static void sil_thaw(struct ata_port *ap)
481 481
482 /* clear IRQ */ 482 /* clear IRQ */
483 ap->ops->check_status(ap); 483 ap->ops->check_status(ap);
484 ata_bmdma_irq_clear(ap); 484 ata_sff_irq_clear(ap);
485 485
486 /* turn on SATA IRQ if supported */ 486 /* turn on SATA IRQ if supported */
487 if (!(ap->flags & SIL_FLAG_NO_SATA_IRQ)) 487 if (!(ap->flags & SIL_FLAG_NO_SATA_IRQ))
@@ -655,7 +655,7 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
655 ioaddr->ctl_addr = mmio_base + sil_port[i].ctl; 655 ioaddr->ctl_addr = mmio_base + sil_port[i].ctl;
656 ioaddr->bmdma_addr = mmio_base + sil_port[i].bmdma; 656 ioaddr->bmdma_addr = mmio_base + sil_port[i].bmdma;
657 ioaddr->scr_addr = mmio_base + sil_port[i].scr; 657 ioaddr->scr_addr = mmio_base + sil_port[i].scr;
658 ata_std_ports(ioaddr); 658 ata_sff_std_ports(ioaddr);
659 659
660 ata_port_pbar_desc(ap, SIL_MMIO_BAR, -1, "mmio"); 660 ata_port_pbar_desc(ap, SIL_MMIO_BAR, -1, "mmio");
661 ata_port_pbar_desc(ap, SIL_MMIO_BAR, sil_port[i].tf, "tf"); 661 ata_port_pbar_desc(ap, SIL_MMIO_BAR, sil_port[i].tf, "tf");