aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_icside.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_icside.c')
-rw-r--r--drivers/ata/pata_icside.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 13d43e9dd279..52de9f908fb0 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -270,7 +270,7 @@ static void pata_icside_bmdma_stop(struct ata_queued_cmd *qc)
270 disable_dma(state->dma); 270 disable_dma(state->dma);
271 271
272 /* see ata_bmdma_stop */ 272 /* see ata_bmdma_stop */
273 ata_altstatus(ap); 273 ata_sff_altstatus(ap);
274} 274}
275 275
276static u8 pata_icside_bmdma_status(struct ata_port *ap) 276static u8 pata_icside_bmdma_status(struct ata_port *ap)
@@ -316,7 +316,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
316 struct pata_icside_state *state = ap->host->private_data; 316 struct pata_icside_state *state = ap->host->private_data;
317 317
318 if (classes[0] != ATA_DEV_NONE || classes[1] != ATA_DEV_NONE) 318 if (classes[0] != ATA_DEV_NONE || classes[1] != ATA_DEV_NONE)
319 return ata_std_postreset(link, classes); 319 return ata_sff_postreset(link, classes);
320 320
321 state->port[ap->port_no].disabled = 1; 321 state->port[ap->port_no].disabled = 1;
322 322
@@ -336,7 +336,7 @@ static struct ata_port_operations pata_icside_port_ops = {
336 .inherits = &ata_sff_port_ops, 336 .inherits = &ata_sff_port_ops,
337 /* no need to build any PRD tables for DMA */ 337 /* no need to build any PRD tables for DMA */
338 .qc_prep = ata_noop_qc_prep, 338 .qc_prep = ata_noop_qc_prep,
339 .data_xfer = ata_data_xfer_noirq, 339 .data_xfer = ata_sff_data_xfer_noirq,
340 .bmdma_setup = pata_icside_bmdma_setup, 340 .bmdma_setup = pata_icside_bmdma_setup,
341 .bmdma_start = pata_icside_bmdma_start, 341 .bmdma_start = pata_icside_bmdma_start,
342 .bmdma_stop = pata_icside_bmdma_stop, 342 .bmdma_stop = pata_icside_bmdma_stop,
@@ -481,7 +481,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
481 pata_icside_setup_ioaddr(ap, info->base, info, info->port[i]); 481 pata_icside_setup_ioaddr(ap, info->base, info, info->port[i]);
482 } 482 }
483 483
484 return ata_host_activate(host, ec->irq, ata_interrupt, 0, 484 return ata_host_activate(host, ec->irq, ata_sff_interrupt, 0,
485 &pata_icside_sht); 485 &pata_icside_sht);
486} 486}
487 487