aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_inic162x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/sata_inic162x.c')
-rw-r--r--drivers/ata/sata_inic162x.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 12fbf3868fe2..6e6fca4c20b6 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -271,7 +271,7 @@ static void inic_host_intr(struct ata_port *ap)
271 return; 271 return;
272 } 272 }
273 273
274 if (likely(ata_host_intr(ap, qc))) 274 if (likely(ata_sff_host_intr(ap, qc)))
275 return; 275 return;
276 276
277 ap->ops->check_status(ap); /* clear ATA interrupt */ 277 ap->ops->check_status(ap); /* clear ATA interrupt */
@@ -356,7 +356,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc)
356 return AC_ERR_HSM; 356 return AC_ERR_HSM;
357 } 357 }
358 358
359 return ata_qc_issue_prot(qc); 359 return ata_sff_qc_issue(qc);
360} 360}
361 361
362static void inic_freeze(struct ata_port *ap) 362static void inic_freeze(struct ata_port *ap)
@@ -418,9 +418,9 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class,
418 struct ata_taskfile tf; 418 struct ata_taskfile tf;
419 419
420 /* wait a while before checking status */ 420 /* wait a while before checking status */
421 ata_wait_after_reset(ap, deadline); 421 ata_sff_wait_after_reset(ap, deadline);
422 422
423 rc = ata_wait_ready(ap, deadline); 423 rc = ata_sff_wait_ready(ap, deadline);
424 /* link occupied, -ENODEV too is an error */ 424 /* link occupied, -ENODEV too is an error */
425 if (rc) { 425 if (rc) {
426 ata_link_printk(link, KERN_WARNING, "device not ready " 426 ata_link_printk(link, KERN_WARNING, "device not ready "
@@ -428,7 +428,7 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class,
428 return rc; 428 return rc;
429 } 429 }
430 430
431 ata_tf_read(ap, &tf); 431 ata_sff_tf_read(ap, &tf);
432 *class = ata_dev_classify(&tf); 432 *class = ata_dev_classify(&tf);
433 if (*class == ATA_DEV_UNKNOWN) 433 if (*class == ATA_DEV_UNKNOWN)
434 *class = ATA_DEV_NONE; 434 *class = ATA_DEV_NONE;
@@ -663,7 +663,7 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
663 ((unsigned long)iomap[2 * i + 1] | ATA_PCI_CTL_OFS); 663 ((unsigned long)iomap[2 * i + 1] | ATA_PCI_CTL_OFS);
664 port->scr_addr = iomap[MMIO_BAR] + offset + PORT_SCR; 664 port->scr_addr = iomap[MMIO_BAR] + offset + PORT_SCR;
665 665
666 ata_std_ports(port); 666 ata_sff_std_ports(port);
667 667
668 ata_port_pbar_desc(ap, MMIO_BAR, -1, "mmio"); 668 ata_port_pbar_desc(ap, MMIO_BAR, -1, "mmio");
669 ata_port_pbar_desc(ap, MMIO_BAR, offset, "port"); 669 ata_port_pbar_desc(ap, MMIO_BAR, offset, "port");