diff options
Diffstat (limited to 'drivers/ata/sata_inic162x.c')
-rw-r--r-- | drivers/ata/sata_inic162x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 6e6fca4c20b6..0b5a736a45e3 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
@@ -222,7 +222,7 @@ static void inic_bmdma_setup(struct ata_queued_cmd *qc) | |||
222 | writeb(pp->cached_prdctl, port_base + PORT_PRD_CTL); | 222 | writeb(pp->cached_prdctl, port_base + PORT_PRD_CTL); |
223 | 223 | ||
224 | /* issue r/w command */ | 224 | /* issue r/w command */ |
225 | ap->ops->exec_command(ap, &qc->tf); | 225 | ap->ops->sff_exec_command(ap, &qc->tf); |
226 | } | 226 | } |
227 | 227 | ||
228 | static void inic_bmdma_start(struct ata_queued_cmd *qc) | 228 | static void inic_bmdma_start(struct ata_queued_cmd *qc) |
@@ -267,14 +267,14 @@ static void inic_host_intr(struct ata_port *ap) | |||
267 | ata_qc_from_tag(ap, ap->link.active_tag); | 267 | ata_qc_from_tag(ap, ap->link.active_tag); |
268 | 268 | ||
269 | if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) { | 269 | if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) { |
270 | ap->ops->check_status(ap); /* clear ATA interrupt */ | 270 | ap->ops->sff_check_status(ap); /* clear ATA interrupt */ |
271 | return; | 271 | return; |
272 | } | 272 | } |
273 | 273 | ||
274 | if (likely(ata_sff_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->sff_check_status(ap); /* clear ATA interrupt */ |
278 | ata_port_printk(ap, KERN_WARNING, "unhandled " | 278 | ata_port_printk(ap, KERN_WARNING, "unhandled " |
279 | "interrupt, irq_stat=%x\n", irq_stat); | 279 | "interrupt, irq_stat=%x\n", irq_stat); |
280 | return; | 280 | return; |
@@ -351,7 +351,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc) | |||
351 | */ | 351 | */ |
352 | if (unlikely(qc->tf.command == ATA_CMD_ID_ATA || | 352 | if (unlikely(qc->tf.command == ATA_CMD_ID_ATA || |
353 | qc->tf.command == ATA_CMD_ID_ATAPI)) { | 353 | qc->tf.command == ATA_CMD_ID_ATAPI)) { |
354 | u8 stat = ap->ops->check_status(ap); | 354 | u8 stat = ap->ops->sff_check_status(ap); |
355 | if (stat == 0x7f || stat == 0xff) | 355 | if (stat == 0x7f || stat == 0xff) |
356 | return AC_ERR_HSM; | 356 | return AC_ERR_HSM; |
357 | } | 357 | } |
@@ -365,7 +365,7 @@ static void inic_freeze(struct ata_port *ap) | |||
365 | 365 | ||
366 | __inic_set_pirq_mask(ap, PIRQ_MASK_FREEZE); | 366 | __inic_set_pirq_mask(ap, PIRQ_MASK_FREEZE); |
367 | 367 | ||
368 | ap->ops->check_status(ap); | 368 | ap->ops->sff_check_status(ap); |
369 | writeb(0xff, port_base + PORT_IRQ_STAT); | 369 | writeb(0xff, port_base + PORT_IRQ_STAT); |
370 | 370 | ||
371 | readb(port_base + PORT_IRQ_STAT); /* flush */ | 371 | readb(port_base + PORT_IRQ_STAT); /* flush */ |
@@ -375,7 +375,7 @@ static void inic_thaw(struct ata_port *ap) | |||
375 | { | 375 | { |
376 | void __iomem *port_base = inic_port_base(ap); | 376 | void __iomem *port_base = inic_port_base(ap); |
377 | 377 | ||
378 | ap->ops->check_status(ap); | 378 | ap->ops->sff_check_status(ap); |
379 | writeb(0xff, port_base + PORT_IRQ_STAT); | 379 | writeb(0xff, port_base + PORT_IRQ_STAT); |
380 | 380 | ||
381 | __inic_set_pirq_mask(ap, PIRQ_MASK_OTHER); | 381 | __inic_set_pirq_mask(ap, PIRQ_MASK_OTHER); |