aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:16 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:21 -0400
commit9363c3825ea9ad76561eb48a395349dd29211ed6 (patch)
treeabe89a0f7c82b805d84b1a211c97b317f6628d5f /drivers/ata
parentb67a1064cb1c1d3b43e01e8b43a6a8dcdefed733 (diff)
libata: rename SFF functions
SFF functions have confusing names. Some have sff prefix, some have bmdma, some std, some pci and some none. Unify the naming by... * SFF functions which are common to both BMDMA and non-BMDMA are prefixed with ata_sff_. * SFF functions which are specific to BMDMA are prefixed with ata_bmdma_. * SFF functions which are specific to PCI but apply to both BMDMA and non-BMDMA are prefixed with ata_pci_sff_. * SFF functions which are specific to PCI and BMDMA are prefixed with ata_pci_bmdma_. * Drop generic prefixes from LLD specific routines. For example, bfin_std_dev_select -> bfin_dev_select. The following renames are noteworthy. ata_qc_issue_prot() -> ata_sff_qc_issue() ata_pci_default_filter() -> ata_bmdma_mode_filter() ata_dev_try_classify() -> ata_sff_dev_classify() This rename is in preparation of separating SFF support out of libata core layer. This patch strictly renames functions and doesn't introduce any behavior difference. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci.c10
-rw-r--r--drivers/ata/ata_generic.c4
-rw-r--r--drivers/ata/ata_piix.c6
-rw-r--r--drivers/ata/libata-core.c16
-rw-r--r--drivers/ata/libata-eh.c2
-rw-r--r--drivers/ata/libata-sff.c344
-rw-r--r--drivers/ata/pata_acpi.c16
-rw-r--r--drivers/ata/pata_ali.c6
-rw-r--r--drivers/ata/pata_amd.c10
-rw-r--r--drivers/ata/pata_artop.c6
-rw-r--r--drivers/ata/pata_at32.c2
-rw-r--r--drivers/ata/pata_atiixp.c6
-rw-r--r--drivers/ata/pata_bf54x.c84
-rw-r--r--drivers/ata/pata_cmd640.c16
-rw-r--r--drivers/ata/pata_cmd64x.c4
-rw-r--r--drivers/ata/pata_cs5520.c8
-rw-r--r--drivers/ata/pata_cs5530.c12
-rw-r--r--drivers/ata/pata_cs5535.c2
-rw-r--r--drivers/ata/pata_cs5536.c2
-rw-r--r--drivers/ata/pata_cypress.c2
-rw-r--r--drivers/ata/pata_efar.c4
-rw-r--r--drivers/ata/pata_hpt366.c4
-rw-r--r--drivers/ata/pata_hpt37x.c10
-rw-r--r--drivers/ata/pata_hpt3x2n.c10
-rw-r--r--drivers/ata/pata_hpt3x3.c6
-rw-r--r--drivers/ata/pata_icside.c8
-rw-r--r--drivers/ata/pata_isapnp.c4
-rw-r--r--drivers/ata/pata_it8213.c4
-rw-r--r--drivers/ata/pata_it821x.c20
-rw-r--r--drivers/ata/pata_ixp4xx_cf.c4
-rw-r--r--drivers/ata/pata_jmicron.c4
-rw-r--r--drivers/ata/pata_legacy.c32
-rw-r--r--drivers/ata/pata_marvell.c4
-rw-r--r--drivers/ata/pata_mpc52xx.c4
-rw-r--r--drivers/ata/pata_mpiix.c18
-rw-r--r--drivers/ata/pata_netcell.c4
-rw-r--r--drivers/ata/pata_ninja32.c6
-rw-r--r--drivers/ata/pata_ns87410.c12
-rw-r--r--drivers/ata/pata_ns87415.c8
-rw-r--r--drivers/ata/pata_oldpiix.c12
-rw-r--r--drivers/ata/pata_opti.c4
-rw-r--r--drivers/ata/pata_optidma.c4
-rw-r--r--drivers/ata/pata_pcmcia.c6
-rw-r--r--drivers/ata/pata_pdc2027x.c10
-rw-r--r--drivers/ata/pata_pdc202xx_old.c2
-rw-r--r--drivers/ata/pata_platform.c4
-rw-r--r--drivers/ata/pata_qdi.c14
-rw-r--r--drivers/ata/pata_radisys.c10
-rw-r--r--drivers/ata/pata_rb500_cf.c6
-rw-r--r--drivers/ata/pata_rz1000.c2
-rw-r--r--drivers/ata/pata_sc1200.c12
-rw-r--r--drivers/ata/pata_scc.c80
-rw-r--r--drivers/ata/pata_serverworks.c12
-rw-r--r--drivers/ata/pata_sil680.c10
-rw-r--r--drivers/ata/pata_sis.c4
-rw-r--r--drivers/ata/pata_sl82c105.c4
-rw-r--r--drivers/ata/pata_triflex.c4
-rw-r--r--drivers/ata/pata_via.c6
-rw-r--r--drivers/ata/pata_winbond.c6
-rw-r--r--drivers/ata/pdc_adma.c12
-rw-r--r--drivers/ata/sata_inic162x.c12
-rw-r--r--drivers/ata/sata_mv.c6
-rw-r--r--drivers/ata/sata_nv.c32
-rw-r--r--drivers/ata/sata_promise.c12
-rw-r--r--drivers/ata/sata_qstor.c10
-rw-r--r--drivers/ata/sata_sil.c8
-rw-r--r--drivers/ata/sata_sis.c6
-rw-r--r--drivers/ata/sata_svw.c4
-rw-r--r--drivers/ata/sata_sx4.c26
-rw-r--r--drivers/ata/sata_uli.c12
-rw-r--r--drivers/ata/sata_via.c12
-rw-r--r--drivers/ata/sata_vsc.c4
72 files changed, 546 insertions, 546 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 3efa9904f7a0..771509c9a3fb 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1303,9 +1303,9 @@ static int ahci_do_softreset(struct ata_link *link, unsigned int *class,
1303 ahci_exec_polled_cmd(ap, pmp, &tf, 0, 0, 0); 1303 ahci_exec_polled_cmd(ap, pmp, &tf, 0, 0, 0);
1304 1304
1305 /* wait a while before checking status */ 1305 /* wait a while before checking status */
1306 ata_wait_after_reset(ap, deadline); 1306 ata_sff_wait_after_reset(ap, deadline);
1307 1307
1308 rc = ata_wait_ready(ap, deadline); 1308 rc = ata_sff_wait_ready(ap, deadline);
1309 /* link occupied, -ENODEV too is an error */ 1309 /* link occupied, -ENODEV too is an error */
1310 if (rc) { 1310 if (rc) {
1311 reason = "device not ready"; 1311 reason = "device not ready";
@@ -1350,7 +1350,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,
1350 tf.command = 0x80; 1350 tf.command = 0x80;
1351 ata_tf_to_fis(&tf, 0, 0, d2h_fis); 1351 ata_tf_to_fis(&tf, 0, 0, d2h_fis);
1352 1352
1353 rc = sata_std_hardreset(link, class, deadline); 1353 rc = sata_sff_hardreset(link, class, deadline);
1354 1354
1355 ahci_start_engine(ap); 1355 ahci_start_engine(ap);
1356 1356
@@ -1431,7 +1431,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class,
1431 * have to be reset again. For most cases, this should 1431 * have to be reset again. For most cases, this should
1432 * suffice while making probing snappish enough. 1432 * suffice while making probing snappish enough.
1433 */ 1433 */
1434 rc = ata_wait_ready(ap, jiffies + 2 * HZ); 1434 rc = ata_sff_wait_ready(ap, jiffies + 2 * HZ);
1435 if (rc) 1435 if (rc)
1436 ahci_kick_engine(ap, 0); 1436 ahci_kick_engine(ap, 0);
1437 1437
@@ -1444,7 +1444,7 @@ static void ahci_postreset(struct ata_link *link, unsigned int *class)
1444 void __iomem *port_mmio = ahci_port_base(ap); 1444 void __iomem *port_mmio = ahci_port_base(ap);
1445 u32 new_tmp, tmp; 1445 u32 new_tmp, tmp;
1446 1446
1447 ata_std_postreset(link, class); 1447 ata_sff_postreset(link, class);
1448 1448
1449 /* Make sure port's ATAPI bit is set appropriately */ 1449 /* Make sure port's ATAPI bit is set appropriately */
1450 new_tmp = tmp = readl(port_mmio + PORT_CMD); 1450 new_tmp = tmp = readl(port_mmio + PORT_CMD);
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index b23e2a1099c5..47aeccd52fa9 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -150,9 +150,9 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
150 return -ENODEV; 150 return -ENODEV;
151 151
152 if (dev->vendor == PCI_VENDOR_ID_AL) 152 if (dev->vendor == PCI_VENDOR_ID_AL)
153 ata_pci_clear_simplex(dev); 153 ata_pci_bmdma_clear_simplex(dev);
154 154
155 return ata_pci_init_one(dev, ppi, &generic_sht, NULL); 155 return ata_pci_sff_init_one(dev, ppi, &generic_sht, NULL);
156} 156}
157 157
158static struct pci_device_id ata_generic[] = { 158static struct pci_device_id ata_generic[] = {
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e113f2f80275..7ab76a413cdf 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -629,7 +629,7 @@ static int piix_pata_prereset(struct ata_link *link, unsigned long deadline)
629 629
630 if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) 630 if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
631 return -ENOENT; 631 return -ENOENT;
632 return ata_std_prereset(link, deadline); 632 return ata_sff_prereset(link, deadline);
633} 633}
634 634
635/** 635/**
@@ -1493,7 +1493,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
1493 hpriv->map = piix_init_sata_map(pdev, port_info, 1493 hpriv->map = piix_init_sata_map(pdev, port_info,
1494 piix_map_db_table[ent->driver_data]); 1494 piix_map_db_table[ent->driver_data]);
1495 1495
1496 rc = ata_pci_prepare_sff_host(pdev, ppi, &host); 1496 rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
1497 if (rc) 1497 if (rc)
1498 return rc; 1498 return rc;
1499 host->private_data = hpriv; 1499 host->private_data = hpriv;
@@ -1527,7 +1527,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
1527 } 1527 }
1528 1528
1529 pci_set_master(pdev); 1529 pci_set_master(pdev);
1530 return ata_pci_activate_sff_host(host, ata_interrupt, &piix_sht); 1530 return ata_pci_sff_activate_host(host, ata_sff_interrupt, &piix_sht);
1531} 1531}
1532 1532
1533static int __init piix_init(void) 1533static int __init piix_init(void)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index fa205d7c5bea..cbdbfb5eaeaa 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -75,9 +75,9 @@ const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };
75 75
76const struct ata_port_operations ata_base_port_ops = { 76const struct ata_port_operations ata_base_port_ops = {
77 .irq_clear = ata_noop_irq_clear, 77 .irq_clear = ata_noop_irq_clear,
78 .prereset = ata_std_prereset, 78 .prereset = ata_sff_prereset,
79 .hardreset = sata_std_hardreset, 79 .hardreset = sata_sff_hardreset,
80 .postreset = ata_std_postreset, 80 .postreset = ata_sff_postreset,
81 .error_handler = ata_std_error_handler, 81 .error_handler = ata_std_error_handler,
82}; 82};
83 83
@@ -3425,7 +3425,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,
3425} 3425}
3426 3426
3427/** 3427/**
3428 * ata_std_prereset - prepare for reset 3428 * ata_sff_prereset - prepare for reset
3429 * @link: ATA link to be reset 3429 * @link: ATA link to be reset
3430 * @deadline: deadline jiffies for the operation 3430 * @deadline: deadline jiffies for the operation
3431 * 3431 *
@@ -3441,7 +3441,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,
3441 * RETURNS: 3441 * RETURNS:
3442 * 0 on success, -errno otherwise. 3442 * 0 on success, -errno otherwise.
3443 */ 3443 */
3444int ata_std_prereset(struct ata_link *link, unsigned long deadline) 3444int ata_sff_prereset(struct ata_link *link, unsigned long deadline)
3445{ 3445{
3446 struct ata_port *ap = link->ap; 3446 struct ata_port *ap = link->ap;
3447 struct ata_eh_context *ehc = &link->eh_context; 3447 struct ata_eh_context *ehc = &link->eh_context;
@@ -3463,7 +3463,7 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline)
3463 3463
3464 /* wait for !BSY if we don't know that no device is attached */ 3464 /* wait for !BSY if we don't know that no device is attached */
3465 if (!ata_link_offline(link)) { 3465 if (!ata_link_offline(link)) {
3466 rc = ata_wait_ready(ap, deadline); 3466 rc = ata_sff_wait_ready(ap, deadline);
3467 if (rc && rc != -ENODEV) { 3467 if (rc && rc != -ENODEV) {
3468 ata_link_printk(link, KERN_WARNING, "device not ready " 3468 ata_link_printk(link, KERN_WARNING, "device not ready "
3469 "(errno=%d), forcing hardreset\n", rc); 3469 "(errno=%d), forcing hardreset\n", rc);
@@ -3535,7 +3535,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
3535} 3535}
3536 3536
3537/** 3537/**
3538 * ata_std_postreset - standard postreset callback 3538 * ata_sff_postreset - standard postreset callback
3539 * @link: the target ata_link 3539 * @link: the target ata_link
3540 * @classes: classes of attached devices 3540 * @classes: classes of attached devices
3541 * 3541 *
@@ -3546,7 +3546,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
3546 * LOCKING: 3546 * LOCKING:
3547 * Kernel thread context (may sleep) 3547 * Kernel thread context (may sleep)
3548 */ 3548 */
3549void ata_std_postreset(struct ata_link *link, unsigned int *classes) 3549void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
3550{ 3550{
3551 struct ata_port *ap = link->ap; 3551 struct ata_port *ap = link->ap;
3552 u32 serror; 3552 u32 serror;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index cc8548e1572a..f4f9c2783821 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2861,7 +2861,7 @@ void ata_std_error_handler(struct ata_port *ap)
2861 * ata_base_port_ops. Ignore it if SCR access is not 2861 * ata_base_port_ops. Ignore it if SCR access is not
2862 * available. 2862 * available.
2863 */ 2863 */
2864 if (hardreset == sata_std_hardreset && !sata_scr_valid(&ap->link)) 2864 if (hardreset == sata_sff_hardreset && !sata_scr_valid(&ap->link))
2865 hardreset = NULL; 2865 hardreset = NULL;
2866 2866
2867 ata_do_eh(ap, ops->prereset, ops->softreset, hardreset, ops->postreset); 2867 ata_do_eh(ap, ops->prereset, ops->softreset, hardreset, ops->postreset);
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 5208ca21f634..8544321293d4 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -42,22 +42,22 @@
42const struct ata_port_operations ata_sff_port_ops = { 42const struct ata_port_operations ata_sff_port_ops = {
43 .inherits = &ata_base_port_ops, 43 .inherits = &ata_base_port_ops,
44 44
45 .qc_prep = ata_qc_prep, 45 .qc_prep = ata_sff_qc_prep,
46 .qc_issue = ata_qc_issue_prot, 46 .qc_issue = ata_sff_qc_issue,
47 47
48 .freeze = ata_bmdma_freeze, 48 .freeze = ata_sff_freeze,
49 .thaw = ata_bmdma_thaw, 49 .thaw = ata_sff_thaw,
50 .softreset = ata_std_softreset, 50 .softreset = ata_sff_softreset,
51 .error_handler = ata_bmdma_error_handler, 51 .error_handler = ata_sff_error_handler,
52 .post_internal_cmd = ata_bmdma_post_internal_cmd, 52 .post_internal_cmd = ata_sff_post_internal_cmd,
53 53
54 .dev_select = ata_std_dev_select, 54 .dev_select = ata_sff_dev_select,
55 .check_status = ata_check_status, 55 .check_status = ata_sff_check_status,
56 .tf_load = ata_tf_load, 56 .tf_load = ata_sff_tf_load,
57 .tf_read = ata_tf_read, 57 .tf_read = ata_sff_tf_read,
58 .exec_command = ata_exec_command, 58 .exec_command = ata_sff_exec_command,
59 .data_xfer = ata_data_xfer, 59 .data_xfer = ata_sff_data_xfer,
60 .irq_on = ata_irq_on, 60 .irq_on = ata_sff_irq_on,
61 61
62 .port_start = ata_sff_port_start, 62 .port_start = ata_sff_port_start,
63}; 63};
@@ -65,13 +65,13 @@ const struct ata_port_operations ata_sff_port_ops = {
65const struct ata_port_operations ata_bmdma_port_ops = { 65const struct ata_port_operations ata_bmdma_port_ops = {
66 .inherits = &ata_sff_port_ops, 66 .inherits = &ata_sff_port_ops,
67 67
68 .mode_filter = ata_pci_default_filter, 68 .mode_filter = ata_bmdma_mode_filter,
69 69
70 .bmdma_setup = ata_bmdma_setup, 70 .bmdma_setup = ata_bmdma_setup,
71 .bmdma_start = ata_bmdma_start, 71 .bmdma_start = ata_bmdma_start,
72 .bmdma_stop = ata_bmdma_stop, 72 .bmdma_stop = ata_bmdma_stop,
73 .bmdma_status = ata_bmdma_status, 73 .bmdma_status = ata_bmdma_status,
74 .irq_clear = ata_bmdma_irq_clear, 74 .irq_clear = ata_sff_irq_clear,
75}; 75};
76 76
77/** 77/**
@@ -181,7 +181,7 @@ static void ata_fill_sg_dumb(struct ata_queued_cmd *qc)
181} 181}
182 182
183/** 183/**
184 * ata_qc_prep - Prepare taskfile for submission 184 * ata_sff_qc_prep - Prepare taskfile for submission
185 * @qc: Metadata associated with taskfile to be prepared 185 * @qc: Metadata associated with taskfile to be prepared
186 * 186 *
187 * Prepare ATA taskfile for submission. 187 * Prepare ATA taskfile for submission.
@@ -189,7 +189,7 @@ static void ata_fill_sg_dumb(struct ata_queued_cmd *qc)
189 * LOCKING: 189 * LOCKING:
190 * spin_lock_irqsave(host lock) 190 * spin_lock_irqsave(host lock)
191 */ 191 */
192void ata_qc_prep(struct ata_queued_cmd *qc) 192void ata_sff_qc_prep(struct ata_queued_cmd *qc)
193{ 193{
194 if (!(qc->flags & ATA_QCFLAG_DMAMAP)) 194 if (!(qc->flags & ATA_QCFLAG_DMAMAP))
195 return; 195 return;
@@ -198,7 +198,7 @@ void ata_qc_prep(struct ata_queued_cmd *qc)
198} 198}
199 199
200/** 200/**
201 * ata_dumb_qc_prep - Prepare taskfile for submission 201 * ata_sff_dumb_qc_prep - Prepare taskfile for submission
202 * @qc: Metadata associated with taskfile to be prepared 202 * @qc: Metadata associated with taskfile to be prepared
203 * 203 *
204 * Prepare ATA taskfile for submission. 204 * Prepare ATA taskfile for submission.
@@ -206,7 +206,7 @@ void ata_qc_prep(struct ata_queued_cmd *qc)
206 * LOCKING: 206 * LOCKING:
207 * spin_lock_irqsave(host lock) 207 * spin_lock_irqsave(host lock)
208 */ 208 */
209void ata_dumb_qc_prep(struct ata_queued_cmd *qc) 209void ata_sff_dumb_qc_prep(struct ata_queued_cmd *qc)
210{ 210{
211 if (!(qc->flags & ATA_QCFLAG_DMAMAP)) 211 if (!(qc->flags & ATA_QCFLAG_DMAMAP))
212 return; 212 return;
@@ -215,7 +215,7 @@ void ata_dumb_qc_prep(struct ata_queued_cmd *qc)
215} 215}
216 216
217/** 217/**
218 * ata_check_status - Read device status reg & clear interrupt 218 * ata_sff_check_status - Read device status reg & clear interrupt
219 * @ap: port where the device is 219 * @ap: port where the device is
220 * 220 *
221 * Reads ATA taskfile status register for currently-selected device 221 * Reads ATA taskfile status register for currently-selected device
@@ -225,13 +225,13 @@ void ata_dumb_qc_prep(struct ata_queued_cmd *qc)
225 * LOCKING: 225 * LOCKING:
226 * Inherited from caller. 226 * Inherited from caller.
227 */ 227 */
228u8 ata_check_status(struct ata_port *ap) 228u8 ata_sff_check_status(struct ata_port *ap)
229{ 229{
230 return ioread8(ap->ioaddr.status_addr); 230 return ioread8(ap->ioaddr.status_addr);
231} 231}
232 232
233/** 233/**
234 * ata_altstatus - Read device alternate status reg 234 * ata_sff_altstatus - Read device alternate status reg
235 * @ap: port where the device is 235 * @ap: port where the device is
236 * 236 *
237 * Reads ATA taskfile alternate status register for 237 * Reads ATA taskfile alternate status register for
@@ -243,7 +243,7 @@ u8 ata_check_status(struct ata_port *ap)
243 * LOCKING: 243 * LOCKING:
244 * Inherited from caller. 244 * Inherited from caller.
245 */ 245 */
246u8 ata_altstatus(struct ata_port *ap) 246u8 ata_sff_altstatus(struct ata_port *ap)
247{ 247{
248 if (ap->ops->check_altstatus) 248 if (ap->ops->check_altstatus)
249 return ap->ops->check_altstatus(ap); 249 return ap->ops->check_altstatus(ap);
@@ -252,7 +252,7 @@ u8 ata_altstatus(struct ata_port *ap)
252} 252}
253 253
254/** 254/**
255 * ata_busy_sleep - sleep until BSY clears, or timeout 255 * ata_sff_busy_sleep - sleep until BSY clears, or timeout
256 * @ap: port containing status register to be polled 256 * @ap: port containing status register to be polled
257 * @tmout_pat: impatience timeout 257 * @tmout_pat: impatience timeout
258 * @tmout: overall timeout 258 * @tmout: overall timeout
@@ -266,19 +266,19 @@ u8 ata_altstatus(struct ata_port *ap)
266 * RETURNS: 266 * RETURNS:
267 * 0 on success, -errno otherwise. 267 * 0 on success, -errno otherwise.
268 */ 268 */
269int ata_busy_sleep(struct ata_port *ap, 269int ata_sff_busy_sleep(struct ata_port *ap,
270 unsigned long tmout_pat, unsigned long tmout) 270 unsigned long tmout_pat, unsigned long tmout)
271{ 271{
272 unsigned long timer_start, timeout; 272 unsigned long timer_start, timeout;
273 u8 status; 273 u8 status;
274 274
275 status = ata_busy_wait(ap, ATA_BUSY, 300); 275 status = ata_sff_busy_wait(ap, ATA_BUSY, 300);
276 timer_start = jiffies; 276 timer_start = jiffies;
277 timeout = timer_start + tmout_pat; 277 timeout = timer_start + tmout_pat;
278 while (status != 0xff && (status & ATA_BUSY) && 278 while (status != 0xff && (status & ATA_BUSY) &&
279 time_before(jiffies, timeout)) { 279 time_before(jiffies, timeout)) {
280 msleep(50); 280 msleep(50);
281 status = ata_busy_wait(ap, ATA_BUSY, 3); 281 status = ata_sff_busy_wait(ap, ATA_BUSY, 3);
282 } 282 }
283 283
284 if (status != 0xff && (status & ATA_BUSY)) 284 if (status != 0xff && (status & ATA_BUSY))
@@ -307,7 +307,7 @@ int ata_busy_sleep(struct ata_port *ap,
307} 307}
308 308
309/** 309/**
310 * ata_wait_ready - sleep until BSY clears, or timeout 310 * ata_sff_wait_ready - sleep until BSY clears, or timeout
311 * @ap: port containing status register to be polled 311 * @ap: port containing status register to be polled
312 * @deadline: deadline jiffies for the operation 312 * @deadline: deadline jiffies for the operation
313 * 313 *
@@ -320,7 +320,7 @@ int ata_busy_sleep(struct ata_port *ap,
320 * RETURNS: 320 * RETURNS:
321 * 0 on success, -errno otherwise. 321 * 0 on success, -errno otherwise.
322 */ 322 */
323int ata_wait_ready(struct ata_port *ap, unsigned long deadline) 323int ata_sff_wait_ready(struct ata_port *ap, unsigned long deadline)
324{ 324{
325 unsigned long start = jiffies; 325 unsigned long start = jiffies;
326 int warned = 0; 326 int warned = 0;
@@ -349,7 +349,7 @@ int ata_wait_ready(struct ata_port *ap, unsigned long deadline)
349} 349}
350 350
351/** 351/**
352 * ata_std_dev_select - Select device 0/1 on ATA bus 352 * ata_sff_dev_select - Select device 0/1 on ATA bus
353 * @ap: ATA channel to manipulate 353 * @ap: ATA channel to manipulate
354 * @device: ATA device (numbered from zero) to select 354 * @device: ATA device (numbered from zero) to select
355 * 355 *
@@ -362,7 +362,7 @@ int ata_wait_ready(struct ata_port *ap, unsigned long deadline)
362 * LOCKING: 362 * LOCKING:
363 * caller. 363 * caller.
364 */ 364 */
365void ata_std_dev_select(struct ata_port *ap, unsigned int device) 365void ata_sff_dev_select(struct ata_port *ap, unsigned int device)
366{ 366{
367 u8 tmp; 367 u8 tmp;
368 368
@@ -372,7 +372,7 @@ void ata_std_dev_select(struct ata_port *ap, unsigned int device)
372 tmp = ATA_DEVICE_OBS | ATA_DEV1; 372 tmp = ATA_DEVICE_OBS | ATA_DEV1;
373 373
374 iowrite8(tmp, ap->ioaddr.device_addr); 374 iowrite8(tmp, ap->ioaddr.device_addr);
375 ata_pause(ap); /* needed; also flushes, for mmio */ 375 ata_sff_pause(ap); /* needed; also flushes, for mmio */
376} 376}
377 377
378/** 378/**
@@ -386,9 +386,9 @@ void ata_std_dev_select(struct ata_port *ap, unsigned int device)
386 * make either device 0, or device 1, active on the 386 * make either device 0, or device 1, active on the
387 * ATA channel. 387 * ATA channel.
388 * 388 *
389 * This is a high-level version of ata_std_dev_select(), 389 * This is a high-level version of ata_sff_dev_select(), which
390 * which additionally provides the services of inserting 390 * additionally provides the services of inserting the proper
391 * the proper pauses and status polling, where needed. 391 * pauses and status polling, where needed.
392 * 392 *
393 * LOCKING: 393 * LOCKING:
394 * caller. 394 * caller.
@@ -413,7 +413,7 @@ void ata_dev_select(struct ata_port *ap, unsigned int device,
413} 413}
414 414
415/** 415/**
416 * ata_irq_on - Enable interrupts on a port. 416 * ata_sff_irq_on - Enable interrupts on a port.
417 * @ap: Port on which interrupts are enabled. 417 * @ap: Port on which interrupts are enabled.
418 * 418 *
419 * Enable interrupts on a legacy IDE device using MMIO or PIO, 419 * Enable interrupts on a legacy IDE device using MMIO or PIO,
@@ -422,7 +422,7 @@ void ata_dev_select(struct ata_port *ap, unsigned int device,
422 * LOCKING: 422 * LOCKING:
423 * Inherited from caller. 423 * Inherited from caller.
424 */ 424 */
425u8 ata_irq_on(struct ata_port *ap) 425u8 ata_sff_irq_on(struct ata_port *ap)
426{ 426{
427 struct ata_ioports *ioaddr = &ap->ioaddr; 427 struct ata_ioports *ioaddr = &ap->ioaddr;
428 u8 tmp; 428 u8 tmp;
@@ -440,7 +440,7 @@ u8 ata_irq_on(struct ata_port *ap)
440} 440}
441 441
442/** 442/**
443 * ata_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt. 443 * ata_sff_irq_clear - Clear PCI IDE BMDMA interrupt.
444 * @ap: Port associated with this ATA transaction. 444 * @ap: Port associated with this ATA transaction.
445 * 445 *
446 * Clear interrupt and error flags in DMA status register. 446 * Clear interrupt and error flags in DMA status register.
@@ -450,7 +450,7 @@ u8 ata_irq_on(struct ata_port *ap)
450 * LOCKING: 450 * LOCKING:
451 * spin_lock_irqsave(host lock) 451 * spin_lock_irqsave(host lock)
452 */ 452 */
453void ata_bmdma_irq_clear(struct ata_port *ap) 453void ata_sff_irq_clear(struct ata_port *ap)
454{ 454{
455 void __iomem *mmio = ap->ioaddr.bmdma_addr; 455 void __iomem *mmio = ap->ioaddr.bmdma_addr;
456 456
@@ -461,7 +461,7 @@ void ata_bmdma_irq_clear(struct ata_port *ap)
461} 461}
462 462
463/** 463/**
464 * ata_tf_load - send taskfile registers to host controller 464 * ata_sff_tf_load - send taskfile registers to host controller
465 * @ap: Port to which output is sent 465 * @ap: Port to which output is sent
466 * @tf: ATA taskfile register set 466 * @tf: ATA taskfile register set
467 * 467 *
@@ -470,7 +470,7 @@ void ata_bmdma_irq_clear(struct ata_port *ap)
470 * LOCKING: 470 * LOCKING:
471 * Inherited from caller. 471 * Inherited from caller.
472 */ 472 */
473void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) 473void ata_sff_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
474{ 474{
475 struct ata_ioports *ioaddr = &ap->ioaddr; 475 struct ata_ioports *ioaddr = &ap->ioaddr;
476 unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR; 476 unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
@@ -520,7 +520,7 @@ void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
520} 520}
521 521
522/** 522/**
523 * ata_tf_read - input device's ATA taskfile shadow registers 523 * ata_sff_tf_read - input device's ATA taskfile shadow registers
524 * @ap: Port from which input is read 524 * @ap: Port from which input is read
525 * @tf: ATA taskfile register set for storing input 525 * @tf: ATA taskfile register set for storing input
526 * 526 *
@@ -532,11 +532,11 @@ void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
532 * LOCKING: 532 * LOCKING:
533 * Inherited from caller. 533 * Inherited from caller.
534 */ 534 */
535void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf) 535void ata_sff_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
536{ 536{
537 struct ata_ioports *ioaddr = &ap->ioaddr; 537 struct ata_ioports *ioaddr = &ap->ioaddr;
538 538
539 tf->command = ata_check_status(ap); 539 tf->command = ata_sff_check_status(ap);
540 tf->feature = ioread8(ioaddr->error_addr); 540 tf->feature = ioread8(ioaddr->error_addr);
541 tf->nsect = ioread8(ioaddr->nsect_addr); 541 tf->nsect = ioread8(ioaddr->nsect_addr);
542 tf->lbal = ioread8(ioaddr->lbal_addr); 542 tf->lbal = ioread8(ioaddr->lbal_addr);
@@ -560,7 +560,7 @@ void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
560} 560}
561 561
562/** 562/**
563 * ata_exec_command - issue ATA command to host controller 563 * ata_sff_exec_command - issue ATA command to host controller
564 * @ap: port to which command is being issued 564 * @ap: port to which command is being issued
565 * @tf: ATA taskfile register set 565 * @tf: ATA taskfile register set
566 * 566 *
@@ -570,12 +570,12 @@ void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
570 * LOCKING: 570 * LOCKING:
571 * spin_lock_irqsave(host lock) 571 * spin_lock_irqsave(host lock)
572 */ 572 */
573void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf) 573void ata_sff_exec_command(struct ata_port *ap, const struct ata_taskfile *tf)
574{ 574{
575 DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command); 575 DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
576 576
577 iowrite8(tf->command, ap->ioaddr.command_addr); 577 iowrite8(tf->command, ap->ioaddr.command_addr);
578 ata_pause(ap); 578 ata_sff_pause(ap);
579} 579}
580 580
581/** 581/**
@@ -598,7 +598,7 @@ static inline void ata_tf_to_host(struct ata_port *ap,
598} 598}
599 599
600/** 600/**
601 * ata_data_xfer - Transfer data by PIO 601 * ata_sff_data_xfer - Transfer data by PIO
602 * @dev: device to target 602 * @dev: device to target
603 * @buf: data buffer 603 * @buf: data buffer
604 * @buflen: buffer length 604 * @buflen: buffer length
@@ -612,8 +612,8 @@ static inline void ata_tf_to_host(struct ata_port *ap,
612 * RETURNS: 612 * RETURNS:
613 * Bytes consumed. 613 * Bytes consumed.
614 */ 614 */
615unsigned int ata_data_xfer(struct ata_device *dev, unsigned char *buf, 615unsigned int ata_sff_data_xfer(struct ata_device *dev, unsigned char *buf,
616 unsigned int buflen, int rw) 616 unsigned int buflen, int rw)
617{ 617{
618 struct ata_port *ap = dev->link->ap; 618 struct ata_port *ap = dev->link->ap;
619 void __iomem *data_addr = ap->ioaddr.data_addr; 619 void __iomem *data_addr = ap->ioaddr.data_addr;
@@ -644,7 +644,7 @@ unsigned int ata_data_xfer(struct ata_device *dev, unsigned char *buf,
644} 644}
645 645
646/** 646/**
647 * ata_data_xfer_noirq - Transfer data by PIO 647 * ata_sff_data_xfer_noirq - Transfer data by PIO
648 * @dev: device to target 648 * @dev: device to target
649 * @buf: data buffer 649 * @buf: data buffer
650 * @buflen: buffer length 650 * @buflen: buffer length
@@ -659,14 +659,14 @@ unsigned int ata_data_xfer(struct ata_device *dev, unsigned char *buf,
659 * RETURNS: 659 * RETURNS:
660 * Bytes consumed. 660 * Bytes consumed.
661 */ 661 */
662unsigned int ata_data_xfer_noirq(struct ata_device *dev, unsigned char *buf, 662unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,
663 unsigned int buflen, int rw) 663 unsigned int buflen, int rw)
664{ 664{
665 unsigned long flags; 665 unsigned long flags;
666 unsigned int consumed; 666 unsigned int consumed;
667 667
668 local_irq_save(flags); 668 local_irq_save(flags);
669 consumed = ata_data_xfer(dev, buf, buflen, rw); 669 consumed = ata_sff_data_xfer(dev, buf, buflen, rw);
670 local_irq_restore(flags); 670 local_irq_restore(flags);
671 671
672 return consumed; 672 return consumed;
@@ -752,7 +752,7 @@ static void ata_pio_sectors(struct ata_queued_cmd *qc)
752 } else 752 } else
753 ata_pio_sector(qc); 753 ata_pio_sector(qc);
754 754
755 ata_altstatus(qc->ap); /* flush */ 755 ata_sff_altstatus(qc->ap); /* flush */
756} 756}
757 757
758/** 758/**
@@ -773,7 +773,7 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
773 WARN_ON(qc->dev->cdb_len < 12); 773 WARN_ON(qc->dev->cdb_len < 12);
774 774
775 ap->ops->data_xfer(qc->dev, qc->cdb, qc->dev->cdb_len, 1); 775 ap->ops->data_xfer(qc->dev, qc->cdb, qc->dev->cdb_len, 1);
776 ata_altstatus(ap); /* flush */ 776 ata_sff_altstatus(ap); /* flush */
777 777
778 switch (qc->tf.protocol) { 778 switch (qc->tf.protocol) {
779 case ATAPI_PROT_PIO: 779 case ATAPI_PROT_PIO:
@@ -915,7 +915,7 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
915 915
916 if (unlikely(__atapi_pio_bytes(qc, bytes))) 916 if (unlikely(__atapi_pio_bytes(qc, bytes)))
917 goto err_out; 917 goto err_out;
918 ata_altstatus(ap); /* flush */ 918 ata_sff_altstatus(ap); /* flush */
919 919
920 return; 920 return;
921 921
@@ -1004,7 +1004,7 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)
1004} 1004}
1005 1005
1006/** 1006/**
1007 * ata_hsm_move - move the HSM to the next state. 1007 * ata_sff_hsm_move - move the HSM to the next state.
1008 * @ap: the target ata_port 1008 * @ap: the target ata_port
1009 * @qc: qc on going 1009 * @qc: qc on going
1010 * @status: current device status 1010 * @status: current device status
@@ -1013,15 +1013,15 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)
1013 * RETURNS: 1013 * RETURNS:
1014 * 1 when poll next status needed, 0 otherwise. 1014 * 1 when poll next status needed, 0 otherwise.
1015 */ 1015 */
1016int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, 1016int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
1017 u8 status, int in_wq) 1017 u8 status, int in_wq)
1018{ 1018{
1019 unsigned long flags = 0; 1019 unsigned long flags = 0;
1020 int poll_next; 1020 int poll_next;
1021 1021
1022 WARN_ON((qc->flags & ATA_QCFLAG_ACTIVE) == 0); 1022 WARN_ON((qc->flags & ATA_QCFLAG_ACTIVE) == 0);
1023 1023
1024 /* Make sure ata_qc_issue_prot() does not throw things 1024 /* Make sure ata_sff_qc_issue() does not throw things
1025 * like DMA polling into the workqueue. Notice that 1025 * like DMA polling into the workqueue. Notice that
1026 * in_wq is not equivalent to (qc->tf.flags & ATA_TFLAG_POLLING). 1026 * in_wq is not equivalent to (qc->tf.flags & ATA_TFLAG_POLLING).
1027 */ 1027 */
@@ -1263,10 +1263,10 @@ fsm_start:
1263 * or something. Snooze for a couple msecs, then 1263 * or something. Snooze for a couple msecs, then
1264 * chk-status again. If still busy, queue delayed work. 1264 * chk-status again. If still busy, queue delayed work.
1265 */ 1265 */
1266 status = ata_busy_wait(ap, ATA_BUSY, 5); 1266 status = ata_sff_busy_wait(ap, ATA_BUSY, 5);
1267 if (status & ATA_BUSY) { 1267 if (status & ATA_BUSY) {
1268 msleep(2); 1268 msleep(2);
1269 status = ata_busy_wait(ap, ATA_BUSY, 10); 1269 status = ata_sff_busy_wait(ap, ATA_BUSY, 10);
1270 if (status & ATA_BUSY) { 1270 if (status & ATA_BUSY) {
1271 ata_pio_queue_task(ap, qc, ATA_SHORT_PAUSE); 1271 ata_pio_queue_task(ap, qc, ATA_SHORT_PAUSE);
1272 return; 1272 return;
@@ -1274,7 +1274,7 @@ fsm_start:
1274 } 1274 }
1275 1275
1276 /* move the HSM */ 1276 /* move the HSM */
1277 poll_next = ata_hsm_move(ap, qc, status, 1); 1277 poll_next = ata_sff_hsm_move(ap, qc, status, 1);
1278 1278
1279 /* another command or interrupt handler 1279 /* another command or interrupt handler
1280 * may be running at this point. 1280 * may be running at this point.
@@ -1284,7 +1284,7 @@ fsm_start:
1284} 1284}
1285 1285
1286/** 1286/**
1287 * ata_qc_issue_prot - issue taskfile to device in proto-dependent manner 1287 * ata_sff_qc_issue - issue taskfile to device in proto-dependent manner
1288 * @qc: command to issue to device 1288 * @qc: command to issue to device
1289 * 1289 *
1290 * Using various libata functions and hooks, this function 1290 * Using various libata functions and hooks, this function
@@ -1300,7 +1300,7 @@ fsm_start:
1300 * RETURNS: 1300 * RETURNS:
1301 * Zero on success, AC_ERR_* mask on failure 1301 * Zero on success, AC_ERR_* mask on failure
1302 */ 1302 */
1303unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) 1303unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc)
1304{ 1304{
1305 struct ata_port *ap = qc->ap; 1305 struct ata_port *ap = qc->ap;
1306 1306
@@ -1415,7 +1415,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)
1415} 1415}
1416 1416
1417/** 1417/**
1418 * ata_host_intr - Handle host interrupt for given (port, task) 1418 * ata_sff_host_intr - Handle host interrupt for given (port, task)
1419 * @ap: Port on which interrupt arrived (possibly...) 1419 * @ap: Port on which interrupt arrived (possibly...)
1420 * @qc: Taskfile currently active in engine 1420 * @qc: Taskfile currently active in engine
1421 * 1421 *
@@ -1429,8 +1429,8 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)
1429 * RETURNS: 1429 * RETURNS:
1430 * One if interrupt was handled, zero if not (shared irq). 1430 * One if interrupt was handled, zero if not (shared irq).
1431 */ 1431 */
1432inline unsigned int ata_host_intr(struct ata_port *ap, 1432inline unsigned int ata_sff_host_intr(struct ata_port *ap,
1433 struct ata_queued_cmd *qc) 1433 struct ata_queued_cmd *qc)
1434{ 1434{
1435 struct ata_eh_info *ehi = &ap->link.eh_info; 1435 struct ata_eh_info *ehi = &ap->link.eh_info;
1436 u8 status, host_stat = 0; 1436 u8 status, host_stat = 0;
@@ -1481,7 +1481,7 @@ inline unsigned int ata_host_intr(struct ata_port *ap,
1481 } 1481 }
1482 1482
1483 /* check altstatus */ 1483 /* check altstatus */
1484 status = ata_altstatus(ap); 1484 status = ata_sff_altstatus(ap);
1485 if (status & ATA_BUSY) 1485 if (status & ATA_BUSY)
1486 goto idle_irq; 1486 goto idle_irq;
1487 1487
@@ -1493,7 +1493,7 @@ inline unsigned int ata_host_intr(struct ata_port *ap,
1493 /* ack bmdma irq events */ 1493 /* ack bmdma irq events */
1494 ap->ops->irq_clear(ap); 1494 ap->ops->irq_clear(ap);
1495 1495
1496 ata_hsm_move(ap, qc, status, 0); 1496 ata_sff_hsm_move(ap, qc, status, 0);
1497 1497
1498 if (unlikely(qc->err_mask) && (qc->tf.protocol == ATA_PROT_DMA || 1498 if (unlikely(qc->err_mask) && (qc->tf.protocol == ATA_PROT_DMA ||
1499 qc->tf.protocol == ATAPI_PROT_DMA)) 1499 qc->tf.protocol == ATAPI_PROT_DMA))
@@ -1516,12 +1516,12 @@ idle_irq:
1516} 1516}
1517 1517
1518/** 1518/**
1519 * ata_interrupt - Default ATA host interrupt handler 1519 * ata_sff_interrupt - Default ATA host interrupt handler
1520 * @irq: irq line (unused) 1520 * @irq: irq line (unused)
1521 * @dev_instance: pointer to our ata_host information structure 1521 * @dev_instance: pointer to our ata_host information structure
1522 * 1522 *
1523 * Default interrupt handler for PCI IDE devices. Calls 1523 * Default interrupt handler for PCI IDE devices. Calls
1524 * ata_host_intr() for each port that is not disabled. 1524 * ata_sff_host_intr() for each port that is not disabled.
1525 * 1525 *
1526 * LOCKING: 1526 * LOCKING:
1527 * Obtains host lock during operation. 1527 * Obtains host lock during operation.
@@ -1529,7 +1529,7 @@ idle_irq:
1529 * RETURNS: 1529 * RETURNS:
1530 * IRQ_NONE or IRQ_HANDLED. 1530 * IRQ_NONE or IRQ_HANDLED.
1531 */ 1531 */
1532irqreturn_t ata_interrupt(int irq, void *dev_instance) 1532irqreturn_t ata_sff_interrupt(int irq, void *dev_instance)
1533{ 1533{
1534 struct ata_host *host = dev_instance; 1534 struct ata_host *host = dev_instance;
1535 unsigned int i; 1535 unsigned int i;
@@ -1550,7 +1550,7 @@ irqreturn_t ata_interrupt(int irq, void *dev_instance)
1550 qc = ata_qc_from_tag(ap, ap->link.active_tag); 1550 qc = ata_qc_from_tag(ap, ap->link.active_tag);
1551 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)) && 1551 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)) &&
1552 (qc->flags & ATA_QCFLAG_ACTIVE)) 1552 (qc->flags & ATA_QCFLAG_ACTIVE))
1553 handled |= ata_host_intr(ap, qc); 1553 handled |= ata_sff_host_intr(ap, qc);
1554 } 1554 }
1555 } 1555 }
1556 1556
@@ -1560,7 +1560,7 @@ irqreturn_t ata_interrupt(int irq, void *dev_instance)
1560} 1560}
1561 1561
1562/** 1562/**
1563 * ata_bmdma_freeze - Freeze BMDMA controller port 1563 * ata_sff_freeze - Freeze SFF controller port
1564 * @ap: port to freeze 1564 * @ap: port to freeze
1565 * 1565 *
1566 * Freeze BMDMA controller port. 1566 * Freeze BMDMA controller port.
@@ -1568,7 +1568,7 @@ irqreturn_t ata_interrupt(int irq, void *dev_instance)
1568 * LOCKING: 1568 * LOCKING:
1569 * Inherited from caller. 1569 * Inherited from caller.
1570 */ 1570 */
1571void ata_bmdma_freeze(struct ata_port *ap) 1571void ata_sff_freeze(struct ata_port *ap)
1572{ 1572{
1573 struct ata_ioports *ioaddr = &ap->ioaddr; 1573 struct ata_ioports *ioaddr = &ap->ioaddr;
1574 1574
@@ -1588,15 +1588,15 @@ void ata_bmdma_freeze(struct ata_port *ap)
1588} 1588}
1589 1589
1590/** 1590/**
1591 * ata_bmdma_thaw - Thaw BMDMA controller port 1591 * ata_sff_thaw - Thaw SFF controller port
1592 * @ap: port to thaw 1592 * @ap: port to thaw
1593 * 1593 *
1594 * Thaw BMDMA controller port. 1594 * Thaw SFF controller port.
1595 * 1595 *
1596 * LOCKING: 1596 * LOCKING:
1597 * Inherited from caller. 1597 * Inherited from caller.
1598 */ 1598 */
1599void ata_bmdma_thaw(struct ata_port *ap) 1599void ata_sff_thaw(struct ata_port *ap)
1600{ 1600{
1601 /* clear & re-enable interrupts */ 1601 /* clear & re-enable interrupts */
1602 ap->ops->check_status(ap); 1602 ap->ops->check_status(ap);
@@ -1647,7 +1647,7 @@ static unsigned int ata_devchk(struct ata_port *ap, unsigned int device)
1647} 1647}
1648 1648
1649/** 1649/**
1650 * ata_dev_try_classify - Parse returned ATA device signature 1650 * ata_sff_dev_classify - Parse returned ATA device signature
1651 * @dev: ATA device to classify (starting at zero) 1651 * @dev: ATA device to classify (starting at zero)
1652 * @present: device seems present 1652 * @present: device seems present
1653 * @r_err: Value of error register on completion 1653 * @r_err: Value of error register on completion
@@ -1667,7 +1667,7 @@ static unsigned int ata_devchk(struct ata_port *ap, unsigned int device)
1667 * RETURNS: 1667 * RETURNS:
1668 * Device type - %ATA_DEV_ATA, %ATA_DEV_ATAPI or %ATA_DEV_NONE. 1668 * Device type - %ATA_DEV_ATA, %ATA_DEV_ATAPI or %ATA_DEV_NONE.
1669 */ 1669 */
1670unsigned int ata_dev_try_classify(struct ata_device *dev, int present, 1670unsigned int ata_sff_dev_classify(struct ata_device *dev, int present,
1671 u8 *r_err) 1671 u8 *r_err)
1672{ 1672{
1673 struct ata_port *ap = dev->link->ap; 1673 struct ata_port *ap = dev->link->ap;
@@ -1727,7 +1727,7 @@ static int ata_bus_post_reset(struct ata_port *ap, unsigned int devmask,
1727 * BSY bit to clear 1727 * BSY bit to clear
1728 */ 1728 */
1729 if (dev0) { 1729 if (dev0) {
1730 rc = ata_wait_ready(ap, deadline); 1730 rc = ata_sff_wait_ready(ap, deadline);
1731 if (rc) { 1731 if (rc) {
1732 if (rc != -ENODEV) 1732 if (rc != -ENODEV)
1733 return rc; 1733 return rc;
@@ -1757,7 +1757,7 @@ static int ata_bus_post_reset(struct ata_port *ap, unsigned int devmask,
1757 msleep(50); /* give drive a breather */ 1757 msleep(50); /* give drive a breather */
1758 } 1758 }
1759 1759
1760 rc = ata_wait_ready(ap, deadline); 1760 rc = ata_sff_wait_ready(ap, deadline);
1761 if (rc) { 1761 if (rc) {
1762 if (rc != -ENODEV) 1762 if (rc != -ENODEV)
1763 return rc; 1763 return rc;
@@ -1776,7 +1776,7 @@ static int ata_bus_post_reset(struct ata_port *ap, unsigned int devmask,
1776} 1776}
1777 1777
1778/** 1778/**
1779 * ata_wait_after_reset - wait before checking status after reset 1779 * ata_sff_wait_after_reset - wait before checking status after reset
1780 * @ap: port containing status register to be polled 1780 * @ap: port containing status register to be polled
1781 * @deadline: deadline jiffies for the operation 1781 * @deadline: deadline jiffies for the operation
1782 * 1782 *
@@ -1790,7 +1790,7 @@ static int ata_bus_post_reset(struct ata_port *ap, unsigned int devmask,
1790 * LOCKING: 1790 * LOCKING:
1791 * Kernel thread context (may sleep). 1791 * Kernel thread context (may sleep).
1792 */ 1792 */
1793void ata_wait_after_reset(struct ata_port *ap, unsigned long deadline) 1793void ata_sff_wait_after_reset(struct ata_port *ap, unsigned long deadline)
1794{ 1794{
1795 unsigned long until = jiffies + ATA_TMOUT_FF_WAIT; 1795 unsigned long until = jiffies + ATA_TMOUT_FF_WAIT;
1796 1796
@@ -1845,7 +1845,7 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
1845 iowrite8(ap->ctl, ioaddr->ctl_addr); 1845 iowrite8(ap->ctl, ioaddr->ctl_addr);
1846 1846
1847 /* wait a while before checking status */ 1847 /* wait a while before checking status */
1848 ata_wait_after_reset(ap, deadline); 1848 ata_sff_wait_after_reset(ap, deadline);
1849 1849
1850 /* Before we perform post reset processing we want to see if 1850 /* Before we perform post reset processing we want to see if
1851 * the bus shows 0xFF because the odd clown forgets the D7 1851 * the bus shows 0xFF because the odd clown forgets the D7
@@ -1858,7 +1858,7 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
1858} 1858}
1859 1859
1860/** 1860/**
1861 * ata_std_softreset - reset host port via ATA SRST 1861 * ata_sff_softreset - reset host port via ATA SRST
1862 * @link: ATA link to reset 1862 * @link: ATA link to reset
1863 * @classes: resulting classes of attached devices 1863 * @classes: resulting classes of attached devices
1864 * @deadline: deadline jiffies for the operation 1864 * @deadline: deadline jiffies for the operation
@@ -1871,7 +1871,7 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
1871 * RETURNS: 1871 * RETURNS:
1872 * 0 on success, -errno otherwise. 1872 * 0 on success, -errno otherwise.
1873 */ 1873 */
1874int ata_std_softreset(struct ata_link *link, unsigned int *classes, 1874int ata_sff_softreset(struct ata_link *link, unsigned int *classes,
1875 unsigned long deadline) 1875 unsigned long deadline)
1876{ 1876{
1877 struct ata_port *ap = link->ap; 1877 struct ata_port *ap = link->ap;
@@ -1906,10 +1906,10 @@ int ata_std_softreset(struct ata_link *link, unsigned int *classes,
1906 } 1906 }
1907 1907
1908 /* determine by signature whether we have ATA or ATAPI devices */ 1908 /* determine by signature whether we have ATA or ATAPI devices */
1909 classes[0] = ata_dev_try_classify(&link->device[0], 1909 classes[0] = ata_sff_dev_classify(&link->device[0],
1910 devmask & (1 << 0), &err); 1910 devmask & (1 << 0), &err);
1911 if (slave_possible && err != 0x81) 1911 if (slave_possible && err != 0x81)
1912 classes[1] = ata_dev_try_classify(&link->device[1], 1912 classes[1] = ata_sff_dev_classify(&link->device[1],
1913 devmask & (1 << 1), &err); 1913 devmask & (1 << 1), &err);
1914 1914
1915 out: 1915 out:
@@ -1918,7 +1918,7 @@ int ata_std_softreset(struct ata_link *link, unsigned int *classes,
1918} 1918}
1919 1919
1920/** 1920/**
1921 * sata_std_hardreset - reset host port via SATA phy reset 1921 * sata_sff_hardreset - reset host port via SATA phy reset
1922 * @link: link to reset 1922 * @link: link to reset
1923 * @class: resulting class of attached device 1923 * @class: resulting class of attached device
1924 * @deadline: deadline jiffies for the operation 1924 * @deadline: deadline jiffies for the operation
@@ -1932,7 +1932,7 @@ int ata_std_softreset(struct ata_link *link, unsigned int *classes,
1932 * RETURNS: 1932 * RETURNS:
1933 * 0 on success, -errno otherwise. 1933 * 0 on success, -errno otherwise.
1934 */ 1934 */
1935int sata_std_hardreset(struct ata_link *link, unsigned int *class, 1935int sata_sff_hardreset(struct ata_link *link, unsigned int *class,
1936 unsigned long deadline) 1936 unsigned long deadline)
1937{ 1937{
1938 struct ata_port *ap = link->ap; 1938 struct ata_port *ap = link->ap;
@@ -1957,7 +1957,7 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class,
1957 } 1957 }
1958 1958
1959 /* wait a while before checking status */ 1959 /* wait a while before checking status */
1960 ata_wait_after_reset(ap, deadline); 1960 ata_sff_wait_after_reset(ap, deadline);
1961 1961
1962 /* If PMP is supported, we have to do follow-up SRST. Note 1962 /* If PMP is supported, we have to do follow-up SRST. Note
1963 * that some PMPs don't send D2H Reg FIS after hardreset at 1963 * that some PMPs don't send D2H Reg FIS after hardreset at
@@ -1965,11 +1965,11 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class,
1965 * second and request follow-up SRST. 1965 * second and request follow-up SRST.
1966 */ 1966 */
1967 if (ap->flags & ATA_FLAG_PMP) { 1967 if (ap->flags & ATA_FLAG_PMP) {
1968 ata_wait_ready(ap, jiffies + HZ); 1968 ata_sff_wait_ready(ap, jiffies + HZ);
1969 return -EAGAIN; 1969 return -EAGAIN;
1970 } 1970 }
1971 1971
1972 rc = ata_wait_ready(ap, deadline); 1972 rc = ata_sff_wait_ready(ap, deadline);
1973 /* link occupied, -ENODEV too is an error */ 1973 /* link occupied, -ENODEV too is an error */
1974 if (rc) { 1974 if (rc) {
1975 ata_link_printk(link, KERN_ERR, 1975 ata_link_printk(link, KERN_ERR,
@@ -1979,17 +1979,17 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class,
1979 1979
1980 ap->ops->dev_select(ap, 0); /* probably unnecessary */ 1980 ap->ops->dev_select(ap, 0); /* probably unnecessary */
1981 1981
1982 *class = ata_dev_try_classify(link->device, 1, NULL); 1982 *class = ata_sff_dev_classify(link->device, 1, NULL);
1983 1983
1984 DPRINTK("EXIT, class=%u\n", *class); 1984 DPRINTK("EXIT, class=%u\n", *class);
1985 return 0; 1985 return 0;
1986} 1986}
1987 1987
1988/** 1988/**
1989 * ata_bmdma_error_handler - Stock error handler for BMDMA controller 1989 * ata_sff_error_handler - Stock error handler for BMDMA controller
1990 * @ap: port to handle error for 1990 * @ap: port to handle error for
1991 * 1991 *
1992 * Stock error handler for BMDMA controller. It can handle both 1992 * Stock error handler for SFF controller. It can handle both
1993 * PATA and SATA controllers. Many controllers should be able to 1993 * PATA and SATA controllers. Many controllers should be able to
1994 * use this EH as-is or with some added handling before and 1994 * use this EH as-is or with some added handling before and
1995 * after. 1995 * after.
@@ -1997,7 +1997,7 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class,
1997 * LOCKING: 1997 * LOCKING:
1998 * Kernel thread context (may sleep) 1998 * Kernel thread context (may sleep)
1999 */ 1999 */
2000void ata_bmdma_error_handler(struct ata_port *ap) 2000void ata_sff_error_handler(struct ata_port *ap)
2001{ 2001{
2002 ata_reset_fn_t softreset = ap->ops->softreset; 2002 ata_reset_fn_t softreset = ap->ops->softreset;
2003 ata_reset_fn_t hardreset = ap->ops->hardreset; 2003 ata_reset_fn_t hardreset = ap->ops->hardreset;
@@ -2034,7 +2034,7 @@ void ata_bmdma_error_handler(struct ata_port *ap)
2034 ap->ops->bmdma_stop(qc); 2034 ap->ops->bmdma_stop(qc);
2035 } 2035 }
2036 2036
2037 ata_altstatus(ap); 2037 ata_sff_altstatus(ap);
2038 ap->ops->check_status(ap); 2038 ap->ops->check_status(ap);
2039 ap->ops->irq_clear(ap); 2039 ap->ops->irq_clear(ap);
2040 2040
@@ -2045,14 +2045,14 @@ void ata_bmdma_error_handler(struct ata_port *ap)
2045 2045
2046 /* PIO and DMA engines have been stopped, perform recovery */ 2046 /* PIO and DMA engines have been stopped, perform recovery */
2047 2047
2048 /* ata_std_softreset and sata_std_hardreset are inherited to 2048 /* ata_sff_softreset and sata_sff_hardreset are inherited to
2049 * all SFF drivers from ata_sff_port_ops. Ignore softreset if 2049 * all SFF drivers from ata_sff_port_ops. Ignore softreset if
2050 * ctl isn't accessible. Ignore hardreset if SCR access isn't 2050 * ctl isn't accessible. Ignore hardreset if SCR access isn't
2051 * available. 2051 * available.
2052 */ 2052 */
2053 if (softreset == ata_std_softreset && !ap->ioaddr.ctl_addr) 2053 if (softreset == ata_sff_softreset && !ap->ioaddr.ctl_addr)
2054 softreset = NULL; 2054 softreset = NULL;
2055 if (hardreset == sata_std_hardreset && !sata_scr_valid(&ap->link)) 2055 if (hardreset == sata_sff_hardreset && !sata_scr_valid(&ap->link))
2056 hardreset = NULL; 2056 hardreset = NULL;
2057 2057
2058 ata_do_eh(ap, ap->ops->prereset, softreset, hardreset, 2058 ata_do_eh(ap, ap->ops->prereset, softreset, hardreset,
@@ -2060,14 +2060,13 @@ void ata_bmdma_error_handler(struct ata_port *ap)
2060} 2060}
2061 2061
2062/** 2062/**
2063 * ata_bmdma_post_internal_cmd - Stock post_internal_cmd for 2063 * ata_sff_post_internal_cmd - Stock post_internal_cmd for SFF controller
2064 * BMDMA controller
2065 * @qc: internal command to clean up 2064 * @qc: internal command to clean up
2066 * 2065 *
2067 * LOCKING: 2066 * LOCKING:
2068 * Kernel thread context (may sleep) 2067 * Kernel thread context (may sleep)
2069 */ 2068 */
2070void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc) 2069void ata_sff_post_internal_cmd(struct ata_queued_cmd *qc)
2071{ 2070{
2072 if (qc->ap->ioaddr.bmdma_addr) 2071 if (qc->ap->ioaddr.bmdma_addr)
2073 ata_bmdma_stop(qc); 2072 ata_bmdma_stop(qc);
@@ -2094,7 +2093,7 @@ int ata_sff_port_start(struct ata_port *ap)
2094} 2093}
2095 2094
2096/** 2095/**
2097 * ata_std_ports - initialize ioaddr with standard port offsets. 2096 * ata_sff_std_ports - initialize ioaddr with standard port offsets.
2098 * @ioaddr: IO address structure to be initialized 2097 * @ioaddr: IO address structure to be initialized
2099 * 2098 *
2100 * Utility function which initializes data_addr, error_addr, 2099 * Utility function which initializes data_addr, error_addr,
@@ -2104,7 +2103,7 @@ int ata_sff_port_start(struct ata_port *ap)
2104 * 2103 *
2105 * Does not set ctl_addr, altstatus_addr, bmdma_addr, or scr_addr. 2104 * Does not set ctl_addr, altstatus_addr, bmdma_addr, or scr_addr.
2106 */ 2105 */
2107void ata_std_ports(struct ata_ioports *ioaddr) 2106void ata_sff_std_ports(struct ata_ioports *ioaddr)
2108{ 2107{
2109 ioaddr->data_addr = ioaddr->cmd_addr + ATA_REG_DATA; 2108 ioaddr->data_addr = ioaddr->cmd_addr + ATA_REG_DATA;
2110 ioaddr->error_addr = ioaddr->cmd_addr + ATA_REG_ERR; 2109 ioaddr->error_addr = ioaddr->cmd_addr + ATA_REG_ERR;
@@ -2118,7 +2117,8 @@ void ata_std_ports(struct ata_ioports *ioaddr)
2118 ioaddr->command_addr = ioaddr->cmd_addr + ATA_REG_CMD; 2117 ioaddr->command_addr = ioaddr->cmd_addr + ATA_REG_CMD;
2119} 2118}
2120 2119
2121unsigned long ata_pci_default_filter(struct ata_device *adev, unsigned long xfer_mask) 2120unsigned long ata_bmdma_mode_filter(struct ata_device *adev,
2121 unsigned long xfer_mask)
2122{ 2122{
2123 /* Filter out DMA modes if the device has been configured by 2123 /* Filter out DMA modes if the device has been configured by
2124 the BIOS as PIO only */ 2124 the BIOS as PIO only */
@@ -2209,7 +2209,7 @@ void ata_bmdma_stop(struct ata_queued_cmd *qc)
2209 mmio + ATA_DMA_CMD); 2209 mmio + ATA_DMA_CMD);
2210 2210
2211 /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */ 2211 /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */
2212 ata_altstatus(ap); /* dummy read */ 2212 ata_sff_altstatus(ap); /* dummy read */
2213} 2213}
2214 2214
2215/** 2215/**
@@ -2289,9 +2289,9 @@ void ata_bus_reset(struct ata_port *ap)
2289 /* 2289 /*
2290 * determine by signature whether we have ATA or ATAPI devices 2290 * determine by signature whether we have ATA or ATAPI devices
2291 */ 2291 */
2292 device[0].class = ata_dev_try_classify(&device[0], dev0, &err); 2292 device[0].class = ata_sff_dev_classify(&device[0], dev0, &err);
2293 if ((slave_possible) && (err != 0x81)) 2293 if ((slave_possible) && (err != 0x81))
2294 device[1].class = ata_dev_try_classify(&device[1], dev1, &err); 2294 device[1].class = ata_sff_dev_classify(&device[1], dev1, &err);
2295 2295
2296 /* is double-select really necessary? */ 2296 /* is double-select really necessary? */
2297 if (device[1].class != ATA_DEV_NONE) 2297 if (device[1].class != ATA_DEV_NONE)
@@ -2322,7 +2322,7 @@ err_out:
2322#ifdef CONFIG_PCI 2322#ifdef CONFIG_PCI
2323 2323
2324/** 2324/**
2325 * ata_pci_clear_simplex - attempt to kick device out of simplex 2325 * ata_pci_bmdma_clear_simplex - attempt to kick device out of simplex
2326 * @pdev: PCI device 2326 * @pdev: PCI device
2327 * 2327 *
2328 * Some PCI ATA devices report simplex mode but in fact can be told to 2328 * Some PCI ATA devices report simplex mode but in fact can be told to
@@ -2330,7 +2330,7 @@ err_out:
2330 * perform the task on such devices. Calling it on other devices will 2330 * perform the task on such devices. Calling it on other devices will
2331 * have -undefined- behaviour. 2331 * have -undefined- behaviour.
2332 */ 2332 */
2333int ata_pci_clear_simplex(struct pci_dev *pdev) 2333int ata_pci_bmdma_clear_simplex(struct pci_dev *pdev)
2334{ 2334{
2335 unsigned long bmdma = pci_resource_start(pdev, 4); 2335 unsigned long bmdma = pci_resource_start(pdev, 4);
2336 u8 simplex; 2336 u8 simplex;
@@ -2347,7 +2347,7 @@ int ata_pci_clear_simplex(struct pci_dev *pdev)
2347} 2347}
2348 2348
2349/** 2349/**
2350 * ata_pci_init_bmdma - acquire PCI BMDMA resources and init ATA host 2350 * ata_pci_bmdma_init - acquire PCI BMDMA resources and init ATA host
2351 * @host: target ATA host 2351 * @host: target ATA host
2352 * 2352 *
2353 * Acquire PCI BMDMA resources and initialize @host accordingly. 2353 * Acquire PCI BMDMA resources and initialize @host accordingly.
@@ -2358,7 +2358,7 @@ int ata_pci_clear_simplex(struct pci_dev *pdev)
2358 * RETURNS: 2358 * RETURNS:
2359 * 0 on success, -errno otherwise. 2359 * 0 on success, -errno otherwise.
2360 */ 2360 */
2361int ata_pci_init_bmdma(struct ata_host *host) 2361int ata_pci_bmdma_init(struct ata_host *host)
2362{ 2362{
2363 struct device *gdev = host->dev; 2363 struct device *gdev = host->dev;
2364 struct pci_dev *pdev = to_pci_dev(gdev); 2364 struct pci_dev *pdev = to_pci_dev(gdev);
@@ -2418,7 +2418,7 @@ static int ata_resources_present(struct pci_dev *pdev, int port)
2418} 2418}
2419 2419
2420/** 2420/**
2421 * ata_pci_init_sff_host - acquire native PCI ATA resources and init host 2421 * ata_pci_sff_init_host - acquire native PCI ATA resources and init host
2422 * @host: target ATA host 2422 * @host: target ATA host
2423 * 2423 *
2424 * Acquire native PCI ATA resources for @host and initialize the 2424 * Acquire native PCI ATA resources for @host and initialize the
@@ -2436,7 +2436,7 @@ static int ata_resources_present(struct pci_dev *pdev, int port)
2436 * 0 if at least one port is initialized, -ENODEV if no port is 2436 * 0 if at least one port is initialized, -ENODEV if no port is
2437 * available. 2437 * available.
2438 */ 2438 */
2439int ata_pci_init_sff_host(struct ata_host *host) 2439int ata_pci_sff_init_host(struct ata_host *host)
2440{ 2440{
2441 struct device *gdev = host->dev; 2441 struct device *gdev = host->dev;
2442 struct pci_dev *pdev = to_pci_dev(gdev); 2442 struct pci_dev *pdev = to_pci_dev(gdev);
@@ -2478,7 +2478,7 @@ int ata_pci_init_sff_host(struct ata_host *host)
2478 ap->ioaddr.altstatus_addr = 2478 ap->ioaddr.altstatus_addr =
2479 ap->ioaddr.ctl_addr = (void __iomem *) 2479 ap->ioaddr.ctl_addr = (void __iomem *)
2480 ((unsigned long)iomap[base + 1] | ATA_PCI_CTL_OFS); 2480 ((unsigned long)iomap[base + 1] | ATA_PCI_CTL_OFS);
2481 ata_std_ports(&ap->ioaddr); 2481 ata_sff_std_ports(&ap->ioaddr);
2482 2482
2483 ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx", 2483 ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx",
2484 (unsigned long long)pci_resource_start(pdev, base), 2484 (unsigned long long)pci_resource_start(pdev, base),
@@ -2496,7 +2496,7 @@ int ata_pci_init_sff_host(struct ata_host *host)
2496} 2496}
2497 2497
2498/** 2498/**
2499 * ata_pci_prepare_sff_host - helper to prepare native PCI ATA host 2499 * ata_pci_sff_prepare_host - helper to prepare native PCI ATA host
2500 * @pdev: target PCI device 2500 * @pdev: target PCI device
2501 * @ppi: array of port_info, must be enough for two ports 2501 * @ppi: array of port_info, must be enough for two ports
2502 * @r_host: out argument for the initialized ATA host 2502 * @r_host: out argument for the initialized ATA host
@@ -2510,7 +2510,7 @@ int ata_pci_init_sff_host(struct ata_host *host)
2510 * RETURNS: 2510 * RETURNS:
2511 * 0 on success, -errno otherwise. 2511 * 0 on success, -errno otherwise.
2512 */ 2512 */
2513int ata_pci_prepare_sff_host(struct pci_dev *pdev, 2513int ata_pci_sff_prepare_host(struct pci_dev *pdev,
2514 const struct ata_port_info * const * ppi, 2514 const struct ata_port_info * const * ppi,
2515 struct ata_host **r_host) 2515 struct ata_host **r_host)
2516{ 2516{
@@ -2528,12 +2528,12 @@ int ata_pci_prepare_sff_host(struct pci_dev *pdev,
2528 goto err_out; 2528 goto err_out;
2529 } 2529 }
2530 2530
2531 rc = ata_pci_init_sff_host(host); 2531 rc = ata_pci_sff_init_host(host);
2532 if (rc) 2532 if (rc)
2533 goto err_out; 2533 goto err_out;
2534 2534
2535 /* init DMA related stuff */ 2535 /* init DMA related stuff */
2536 rc = ata_pci_init_bmdma(host); 2536 rc = ata_pci_bmdma_init(host);
2537 if (rc) 2537 if (rc)
2538 goto err_bmdma; 2538 goto err_bmdma;
2539 2539
@@ -2554,7 +2554,7 @@ int ata_pci_prepare_sff_host(struct pci_dev *pdev,
2554} 2554}
2555 2555
2556/** 2556/**
2557 * ata_pci_activate_sff_host - start SFF host, request IRQ and register it 2557 * ata_pci_sff_activate_host - start SFF host, request IRQ and register it
2558 * @host: target SFF ATA host 2558 * @host: target SFF ATA host
2559 * @irq_handler: irq_handler used when requesting IRQ(s) 2559 * @irq_handler: irq_handler used when requesting IRQ(s)
2560 * @sht: scsi_host_template to use when registering the host 2560 * @sht: scsi_host_template to use when registering the host
@@ -2569,7 +2569,7 @@ int ata_pci_prepare_sff_host(struct pci_dev *pdev,
2569 * RETURNS: 2569 * RETURNS:
2570 * 0 on success, -errno otherwise. 2570 * 0 on success, -errno otherwise.
2571 */ 2571 */
2572int ata_pci_activate_sff_host(struct ata_host *host, 2572int ata_pci_sff_activate_host(struct ata_host *host,
2573 irq_handler_t irq_handler, 2573 irq_handler_t irq_handler,
2574 struct scsi_host_template *sht) 2574 struct scsi_host_template *sht)
2575{ 2575{
@@ -2647,7 +2647,7 @@ int ata_pci_activate_sff_host(struct ata_host *host,
2647} 2647}
2648 2648
2649/** 2649/**
2650 * ata_pci_init_one - Initialize/register PCI IDE host controller 2650 * ata_pci_sff_init_one - Initialize/register PCI IDE host controller
2651 * @pdev: Controller to be initialized 2651 * @pdev: Controller to be initialized
2652 * @ppi: array of port_info, must be enough for two ports 2652 * @ppi: array of port_info, must be enough for two ports
2653 * @sht: scsi_host_template to use when registering the host 2653 * @sht: scsi_host_template to use when registering the host
@@ -2671,9 +2671,9 @@ int ata_pci_activate_sff_host(struct ata_host *host,
2671 * RETURNS: 2671 * RETURNS:
2672 * Zero on success, negative on errno-based value on error. 2672 * Zero on success, negative on errno-based value on error.
2673 */ 2673 */
2674int ata_pci_init_one(struct pci_dev *pdev, 2674int ata_pci_sff_init_one(struct pci_dev *pdev,
2675 const struct ata_port_info * const * ppi, 2675 const struct ata_port_info * const * ppi,
2676 struct scsi_host_template *sht, void *host_priv) 2676 struct scsi_host_template *sht, void *host_priv)
2677{ 2677{
2678 struct device *dev = &pdev->dev; 2678 struct device *dev = &pdev->dev;
2679 const struct ata_port_info *pi = NULL; 2679 const struct ata_port_info *pi = NULL;
@@ -2704,13 +2704,13 @@ int ata_pci_init_one(struct pci_dev *pdev,
2704 goto out; 2704 goto out;
2705 2705
2706 /* prepare and activate SFF host */ 2706 /* prepare and activate SFF host */
2707 rc = ata_pci_prepare_sff_host(pdev, ppi, &host); 2707 rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
2708 if (rc) 2708 if (rc)
2709 goto out; 2709 goto out;
2710 host->private_data = host_priv; 2710 host->private_data = host_priv;
2711 2711
2712 pci_set_master(pdev); 2712 pci_set_master(pdev);
2713 rc = ata_pci_activate_sff_host(host, ata_interrupt, sht); 2713 rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht);
2714 out: 2714 out:
2715 if (rc == 0) 2715 if (rc == 0)
2716 devres_remove_group(&pdev->dev, NULL); 2716 devres_remove_group(&pdev->dev, NULL);
@@ -2724,47 +2724,47 @@ int ata_pci_init_one(struct pci_dev *pdev,
2724 2724
2725EXPORT_SYMBOL_GPL(ata_sff_port_ops); 2725EXPORT_SYMBOL_GPL(ata_sff_port_ops);
2726EXPORT_SYMBOL_GPL(ata_bmdma_port_ops); 2726EXPORT_SYMBOL_GPL(ata_bmdma_port_ops);
2727EXPORT_SYMBOL_GPL(ata_qc_prep); 2727EXPORT_SYMBOL_GPL(ata_sff_qc_prep);
2728EXPORT_SYMBOL_GPL(ata_dumb_qc_prep); 2728EXPORT_SYMBOL_GPL(ata_sff_dumb_qc_prep);
2729EXPORT_SYMBOL_GPL(ata_std_dev_select); 2729EXPORT_SYMBOL_GPL(ata_sff_dev_select);
2730EXPORT_SYMBOL_GPL(ata_check_status); 2730EXPORT_SYMBOL_GPL(ata_sff_check_status);
2731EXPORT_SYMBOL_GPL(ata_altstatus); 2731EXPORT_SYMBOL_GPL(ata_sff_altstatus);
2732EXPORT_SYMBOL_GPL(ata_busy_sleep); 2732EXPORT_SYMBOL_GPL(ata_sff_busy_sleep);
2733EXPORT_SYMBOL_GPL(ata_wait_ready); 2733EXPORT_SYMBOL_GPL(ata_sff_wait_ready);
2734EXPORT_SYMBOL_GPL(ata_tf_load); 2734EXPORT_SYMBOL_GPL(ata_sff_tf_load);
2735EXPORT_SYMBOL_GPL(ata_tf_read); 2735EXPORT_SYMBOL_GPL(ata_sff_tf_read);
2736EXPORT_SYMBOL_GPL(ata_exec_command); 2736EXPORT_SYMBOL_GPL(ata_sff_exec_command);
2737EXPORT_SYMBOL_GPL(ata_data_xfer); 2737EXPORT_SYMBOL_GPL(ata_sff_data_xfer);
2738EXPORT_SYMBOL_GPL(ata_data_xfer_noirq); 2738EXPORT_SYMBOL_GPL(ata_sff_data_xfer_noirq);
2739EXPORT_SYMBOL_GPL(ata_irq_on); 2739EXPORT_SYMBOL_GPL(ata_sff_irq_on);
2740EXPORT_SYMBOL_GPL(ata_bmdma_irq_clear); 2740EXPORT_SYMBOL_GPL(ata_sff_irq_clear);
2741EXPORT_SYMBOL_GPL(ata_hsm_move); 2741EXPORT_SYMBOL_GPL(ata_sff_hsm_move);
2742EXPORT_SYMBOL_GPL(ata_qc_issue_prot); 2742EXPORT_SYMBOL_GPL(ata_sff_qc_issue);
2743EXPORT_SYMBOL_GPL(ata_host_intr); 2743EXPORT_SYMBOL_GPL(ata_sff_host_intr);
2744EXPORT_SYMBOL_GPL(ata_interrupt); 2744EXPORT_SYMBOL_GPL(ata_sff_interrupt);
2745EXPORT_SYMBOL_GPL(ata_bmdma_freeze); 2745EXPORT_SYMBOL_GPL(ata_sff_freeze);
2746EXPORT_SYMBOL_GPL(ata_bmdma_thaw); 2746EXPORT_SYMBOL_GPL(ata_sff_thaw);
2747EXPORT_SYMBOL_GPL(ata_std_prereset); 2747EXPORT_SYMBOL_GPL(ata_sff_prereset);
2748EXPORT_SYMBOL_GPL(ata_dev_try_classify); 2748EXPORT_SYMBOL_GPL(ata_sff_dev_classify);
2749EXPORT_SYMBOL_GPL(ata_wait_after_reset); 2749EXPORT_SYMBOL_GPL(ata_sff_wait_after_reset);
2750EXPORT_SYMBOL_GPL(ata_std_softreset); 2750EXPORT_SYMBOL_GPL(ata_sff_softreset);
2751EXPORT_SYMBOL_GPL(sata_std_hardreset); 2751EXPORT_SYMBOL_GPL(sata_sff_hardreset);
2752EXPORT_SYMBOL_GPL(ata_std_postreset); 2752EXPORT_SYMBOL_GPL(ata_sff_postreset);
2753EXPORT_SYMBOL_GPL(ata_bmdma_error_handler); 2753EXPORT_SYMBOL_GPL(ata_sff_error_handler);
2754EXPORT_SYMBOL_GPL(ata_bmdma_post_internal_cmd); 2754EXPORT_SYMBOL_GPL(ata_sff_post_internal_cmd);
2755EXPORT_SYMBOL_GPL(ata_sff_port_start); 2755EXPORT_SYMBOL_GPL(ata_sff_port_start);
2756EXPORT_SYMBOL_GPL(ata_std_ports); 2756EXPORT_SYMBOL_GPL(ata_sff_std_ports);
2757EXPORT_SYMBOL_GPL(ata_pci_default_filter); 2757EXPORT_SYMBOL_GPL(ata_bmdma_mode_filter);
2758EXPORT_SYMBOL_GPL(ata_bmdma_setup); 2758EXPORT_SYMBOL_GPL(ata_bmdma_setup);
2759EXPORT_SYMBOL_GPL(ata_bmdma_start); 2759EXPORT_SYMBOL_GPL(ata_bmdma_start);
2760EXPORT_SYMBOL_GPL(ata_bmdma_stop); 2760EXPORT_SYMBOL_GPL(ata_bmdma_stop);
2761EXPORT_SYMBOL_GPL(ata_bmdma_status); 2761EXPORT_SYMBOL_GPL(ata_bmdma_status);
2762EXPORT_SYMBOL_GPL(ata_bus_reset); 2762EXPORT_SYMBOL_GPL(ata_bus_reset);
2763#ifdef CONFIG_PCI 2763#ifdef CONFIG_PCI
2764EXPORT_SYMBOL_GPL(ata_pci_clear_simplex); 2764EXPORT_SYMBOL_GPL(ata_pci_bmdma_clear_simplex);
2765EXPORT_SYMBOL_GPL(ata_pci_init_bmdma); 2765EXPORT_SYMBOL_GPL(ata_pci_bmdma_init);
2766EXPORT_SYMBOL_GPL(ata_pci_init_sff_host); 2766EXPORT_SYMBOL_GPL(ata_pci_sff_init_host);
2767EXPORT_SYMBOL_GPL(ata_pci_prepare_sff_host); 2767EXPORT_SYMBOL_GPL(ata_pci_sff_prepare_host);
2768EXPORT_SYMBOL_GPL(ata_pci_activate_sff_host); 2768EXPORT_SYMBOL_GPL(ata_pci_sff_activate_host);
2769EXPORT_SYMBOL_GPL(ata_pci_init_one); 2769EXPORT_SYMBOL_GPL(ata_pci_sff_init_one);
2770#endif /* CONFIG_PCI */ 2770#endif /* CONFIG_PCI */
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index d337f3209caf..c5f91e629945 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -47,7 +47,7 @@ static int pacpi_pre_reset(struct ata_link *link, unsigned long deadline)
47 if (ap->acpi_handle == NULL || ata_acpi_gtm(ap, &acpi->gtm) < 0) 47 if (ap->acpi_handle == NULL || ata_acpi_gtm(ap, &acpi->gtm) < 0)
48 return -ENODEV; 48 return -ENODEV;
49 49
50 return ata_std_prereset(link, deadline); 50 return ata_sff_prereset(link, deadline);
51} 51}
52 52
53/** 53/**
@@ -106,7 +106,7 @@ static unsigned long pacpi_discover_modes(struct ata_port *ap, struct ata_device
106static unsigned long pacpi_mode_filter(struct ata_device *adev, unsigned long mask) 106static unsigned long pacpi_mode_filter(struct ata_device *adev, unsigned long mask)
107{ 107{
108 struct pata_acpi *acpi = adev->link->ap->private_data; 108 struct pata_acpi *acpi = adev->link->ap->private_data;
109 return ata_pci_default_filter(adev, mask & acpi->mask[adev->devno]); 109 return ata_bmdma_mode_filter(adev, mask & acpi->mask[adev->devno]);
110} 110}
111 111
112/** 112/**
@@ -162,7 +162,7 @@ static void pacpi_set_dmamode(struct ata_port *ap, struct ata_device *adev)
162} 162}
163 163
164/** 164/**
165 * pacpi_qc_issue_prot - command issue 165 * pacpi_qc_issue - command issue
166 * @qc: command pending 166 * @qc: command pending
167 * 167 *
168 * Called when the libata layer is about to issue a command. We wrap 168 * Called when the libata layer is about to issue a command. We wrap
@@ -170,14 +170,14 @@ static void pacpi_set_dmamode(struct ata_port *ap, struct ata_device *adev)
170 * neccessary. 170 * neccessary.
171 */ 171 */
172 172
173static unsigned int pacpi_qc_issue_prot(struct ata_queued_cmd *qc) 173static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)
174{ 174{
175 struct ata_port *ap = qc->ap; 175 struct ata_port *ap = qc->ap;
176 struct ata_device *adev = qc->dev; 176 struct ata_device *adev = qc->dev;
177 struct pata_acpi *acpi = ap->private_data; 177 struct pata_acpi *acpi = ap->private_data;
178 178
179 if (acpi->gtm.flags & 0x10) 179 if (acpi->gtm.flags & 0x10)
180 return ata_qc_issue_prot(qc); 180 return ata_sff_qc_issue(qc);
181 181
182 if (adev != acpi->last) { 182 if (adev != acpi->last) {
183 pacpi_set_piomode(ap, adev); 183 pacpi_set_piomode(ap, adev);
@@ -185,7 +185,7 @@ static unsigned int pacpi_qc_issue_prot(struct ata_queued_cmd *qc)
185 pacpi_set_dmamode(ap, adev); 185 pacpi_set_dmamode(ap, adev);
186 acpi->last = adev; 186 acpi->last = adev;
187 } 187 }
188 return ata_qc_issue_prot(qc); 188 return ata_sff_qc_issue(qc);
189} 189}
190 190
191/** 191/**
@@ -223,7 +223,7 @@ static struct scsi_host_template pacpi_sht = {
223 223
224static struct ata_port_operations pacpi_ops = { 224static struct ata_port_operations pacpi_ops = {
225 .inherits = &ata_bmdma_port_ops, 225 .inherits = &ata_bmdma_port_ops,
226 .qc_issue = pacpi_qc_issue_prot, 226 .qc_issue = pacpi_qc_issue,
227 .cable_detect = pacpi_cable_detect, 227 .cable_detect = pacpi_cable_detect,
228 .mode_filter = pacpi_mode_filter, 228 .mode_filter = pacpi_mode_filter,
229 .set_piomode = pacpi_set_piomode, 229 .set_piomode = pacpi_set_piomode,
@@ -259,7 +259,7 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
259 .port_ops = &pacpi_ops, 259 .port_ops = &pacpi_ops,
260 }; 260 };
261 const struct ata_port_info *ppi[] = { &info, NULL }; 261 const struct ata_port_info *ppi[] = { &info, NULL };
262 return ata_pci_init_one(pdev, ppi, &pacpi_sht, NULL); 262 return ata_pci_sff_init_one(pdev, ppi, &pacpi_sht, NULL);
263} 263}
264 264
265static const struct pci_device_id pacpi_pci_tbl[] = { 265static const struct pci_device_id pacpi_pci_tbl[] = {
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 43c558f20f92..fcabe46f262b 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -121,7 +121,7 @@ static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
121 ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num)); 121 ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
122 if (strstr(model_num, "WDC")) 122 if (strstr(model_num, "WDC"))
123 return mask &= ~ATA_MASK_UDMA; 123 return mask &= ~ATA_MASK_UDMA;
124 return ata_pci_default_filter(adev, mask); 124 return ata_bmdma_mode_filter(adev, mask);
125} 125}
126 126
127/** 127/**
@@ -449,7 +449,7 @@ static void ali_init_chipset(struct pci_dev *pdev)
449 } 449 }
450 pci_dev_put(isa_bridge); 450 pci_dev_put(isa_bridge);
451 pci_dev_put(north); 451 pci_dev_put(north);
452 ata_pci_clear_simplex(pdev); 452 ata_pci_bmdma_clear_simplex(pdev);
453} 453}
454/** 454/**
455 * ali_init_one - discovery callback 455 * ali_init_one - discovery callback
@@ -552,7 +552,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
552 ppi[0] = &info_20_udma; 552 ppi[0] = &info_20_udma;
553 pci_dev_put(isa_bridge); 553 pci_dev_put(isa_bridge);
554 } 554 }
555 return ata_pci_init_one(pdev, ppi, &ali_sht, NULL); 555 return ata_pci_sff_init_one(pdev, ppi, &ali_sht, NULL);
556} 556}
557 557
558#ifdef CONFIG_PM 558#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 33074c34105c..26665c396485 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -143,7 +143,7 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline)
143 if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no])) 143 if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no]))
144 return -ENOENT; 144 return -ENOENT;
145 145
146 return ata_std_prereset(link, deadline); 146 return ata_sff_prereset(link, deadline);
147} 147}
148 148
149static int amd_cable_detect(struct ata_port *ap) 149static int amd_cable_detect(struct ata_port *ap)
@@ -293,7 +293,7 @@ static int nv_pre_reset(struct ata_link *link, unsigned long deadline)
293 if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no])) 293 if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no]))
294 return -ENOENT; 294 return -ENOENT;
295 295
296 return ata_std_prereset(link, deadline); 296 return ata_sff_prereset(link, deadline);
297} 297}
298 298
299/** 299/**
@@ -503,7 +503,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
503 ppi[0] = &info[type]; 503 ppi[0] = &info[type];
504 504
505 if (type < 3) 505 if (type < 3)
506 ata_pci_clear_simplex(pdev); 506 ata_pci_bmdma_clear_simplex(pdev);
507 507
508 /* Check for AMD7411 */ 508 /* Check for AMD7411 */
509 if (type == 3) 509 if (type == 3)
@@ -523,7 +523,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
523 } 523 }
524 524
525 /* And fire it up */ 525 /* And fire it up */
526 return ata_pci_init_one(pdev, ppi, &amd_sht, hpriv); 526 return ata_pci_sff_init_one(pdev, ppi, &amd_sht, hpriv);
527} 527}
528 528
529#ifdef CONFIG_PM 529#ifdef CONFIG_PM
@@ -546,7 +546,7 @@ static int amd_reinit_one(struct pci_dev *pdev)
546 pci_write_config_byte(pdev, 0x41, fifo | 0xF0); 546 pci_write_config_byte(pdev, 0x41, fifo | 0xF0);
547 if (pdev->device == PCI_DEVICE_ID_AMD_VIPER_7409 || 547 if (pdev->device == PCI_DEVICE_ID_AMD_VIPER_7409 ||
548 pdev->device == PCI_DEVICE_ID_AMD_COBRA_7401) 548 pdev->device == PCI_DEVICE_ID_AMD_COBRA_7401)
549 ata_pci_clear_simplex(pdev); 549 ata_pci_bmdma_clear_simplex(pdev);
550 } 550 }
551 551
552 ata_host_resume(host); 552 ata_host_resume(host);
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index b6d8c4d0e6c2..0f513bc11193 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -52,7 +52,7 @@ static int artop6210_pre_reset(struct ata_link *link, unsigned long deadline)
52 if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) 52 if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
53 return -ENOENT; 53 return -ENOENT;
54 54
55 return ata_std_prereset(link, deadline); 55 return ata_sff_prereset(link, deadline);
56} 56}
57 57
58/** 58/**
@@ -78,7 +78,7 @@ static int artop6260_pre_reset(struct ata_link *link, unsigned long deadline)
78 if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) 78 if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
79 return -ENOENT; 79 return -ENOENT;
80 80
81 return ata_std_prereset(link, deadline); 81 return ata_sff_prereset(link, deadline);
82} 82}
83 83
84/** 84/**
@@ -400,7 +400,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
400 400
401 BUG_ON(ppi[0] == NULL); 401 BUG_ON(ppi[0] == NULL);
402 402
403 return ata_pci_init_one(pdev, ppi, &artop_sht, NULL); 403 return ata_pci_sff_init_one(pdev, ppi, &artop_sht, NULL);
404} 404}
405 405
406static const struct pci_device_id artop_pci_tbl[] = { 406static const struct pci_device_id artop_pci_tbl[] = {
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index 528315587532..3e8651d78952 100644
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -223,7 +223,7 @@ static int __init pata_at32_init_one(struct device *dev,
223 host->private_data = info; 223 host->private_data = info;
224 224
225 /* Register ATA device and return */ 225 /* Register ATA device and return */
226 return ata_host_activate(host, info->irq, ata_interrupt, 226 return ata_host_activate(host, info->irq, ata_sff_interrupt,
227 IRQF_SHARED | IRQF_TRIGGER_RISING, 227 IRQF_SHARED | IRQF_TRIGGER_RISING,
228 &at32_sht); 228 &at32_sht);
229} 229}
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 56a65baddd4a..78738fb4223b 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -45,7 +45,7 @@ static int atiixp_pre_reset(struct ata_link *link, unsigned long deadline)
45 if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no])) 45 if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no]))
46 return -ENOENT; 46 return -ENOENT;
47 47
48 return ata_std_prereset(link, deadline); 48 return ata_sff_prereset(link, deadline);
49} 49}
50 50
51static int atiixp_cable_detect(struct ata_port *ap) 51static int atiixp_cable_detect(struct ata_port *ap)
@@ -223,7 +223,7 @@ static struct scsi_host_template atiixp_sht = {
223static struct ata_port_operations atiixp_port_ops = { 223static struct ata_port_operations atiixp_port_ops = {
224 .inherits = &ata_bmdma_port_ops, 224 .inherits = &ata_bmdma_port_ops,
225 225
226 .qc_prep = ata_dumb_qc_prep, 226 .qc_prep = ata_sff_dumb_qc_prep,
227 .bmdma_start = atiixp_bmdma_start, 227 .bmdma_start = atiixp_bmdma_start,
228 .bmdma_stop = atiixp_bmdma_stop, 228 .bmdma_stop = atiixp_bmdma_stop,
229 229
@@ -243,7 +243,7 @@ static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
243 .port_ops = &atiixp_port_ops 243 .port_ops = &atiixp_port_ops
244 }; 244 };
245 const struct ata_port_info *ppi[] = { &info, NULL }; 245 const struct ata_port_info *ppi[] = { &info, NULL };
246 return ata_pci_init_one(dev, ppi, &atiixp_sht, NULL); 246 return ata_pci_sff_init_one(dev, ppi, &atiixp_sht, NULL);
247} 247}
248 248
249static const struct pci_device_id atiixp[] = { 249static const struct pci_device_id atiixp[] = {
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 457ac800cd5e..c854e882d4a9 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -674,7 +674,7 @@ static void read_atapi_data(void __iomem *base,
674 * @ap: Port to which output is sent 674 * @ap: Port to which output is sent
675 * @tf: ATA taskfile register set 675 * @tf: ATA taskfile register set
676 * 676 *
677 * Note: Original code is ata_tf_load(). 677 * Note: Original code is ata_sff_tf_load().
678 */ 678 */
679 679
680static void bfin_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) 680static void bfin_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
@@ -745,7 +745,7 @@ static u8 bfin_check_status(struct ata_port *ap)
745 * @ap: Port from which input is read 745 * @ap: Port from which input is read
746 * @tf: ATA taskfile register set for storing input 746 * @tf: ATA taskfile register set for storing input
747 * 747 *
748 * Note: Original code is ata_tf_read(). 748 * Note: Original code is ata_sff_tf_read().
749 */ 749 */
750 750
751static void bfin_tf_read(struct ata_port *ap, struct ata_taskfile *tf) 751static void bfin_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
@@ -775,7 +775,7 @@ static void bfin_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
775 * @ap: port to which command is being issued 775 * @ap: port to which command is being issued
776 * @tf: ATA taskfile register set 776 * @tf: ATA taskfile register set
777 * 777 *
778 * Note: Original code is ata_exec_command(). 778 * Note: Original code is ata_sff_exec_command().
779 */ 779 */
780 780
781static void bfin_exec_command(struct ata_port *ap, 781static void bfin_exec_command(struct ata_port *ap,
@@ -785,7 +785,7 @@ static void bfin_exec_command(struct ata_port *ap,
785 dev_dbg(ap->dev, "ata%u: cmd 0x%X\n", ap->print_id, tf->command); 785 dev_dbg(ap->dev, "ata%u: cmd 0x%X\n", ap->print_id, tf->command);
786 786
787 write_atapi_register(base, ATA_REG_CMD, tf->command); 787 write_atapi_register(base, ATA_REG_CMD, tf->command);
788 ata_pause(ap); 788 ata_sff_pause(ap);
789} 789}
790 790
791/** 791/**
@@ -800,14 +800,14 @@ static u8 bfin_check_altstatus(struct ata_port *ap)
800} 800}
801 801
802/** 802/**
803 * bfin_std_dev_select - Select device 0/1 on ATA bus 803 * bfin_dev_select - Select device 0/1 on ATA bus
804 * @ap: ATA channel to manipulate 804 * @ap: ATA channel to manipulate
805 * @device: ATA device (numbered from zero) to select 805 * @device: ATA device (numbered from zero) to select
806 * 806 *
807 * Note: Original code is ata_std_dev_select(). 807 * Note: Original code is ata_sff_dev_select().
808 */ 808 */
809 809
810static void bfin_std_dev_select(struct ata_port *ap, unsigned int device) 810static void bfin_dev_select(struct ata_port *ap, unsigned int device)
811{ 811{
812 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr; 812 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
813 u8 tmp; 813 u8 tmp;
@@ -818,7 +818,7 @@ static void bfin_std_dev_select(struct ata_port *ap, unsigned int device)
818 tmp = ATA_DEVICE_OBS | ATA_DEV1; 818 tmp = ATA_DEVICE_OBS | ATA_DEV1;
819 819
820 write_atapi_register(base, ATA_REG_DEVICE, tmp); 820 write_atapi_register(base, ATA_REG_DEVICE, tmp);
821 ata_pause(ap); 821 ata_sff_pause(ap);
822} 822}
823 823
824/** 824/**
@@ -977,7 +977,7 @@ static unsigned int bfin_devchk(struct ata_port *ap,
977 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr; 977 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
978 u8 nsect, lbal; 978 u8 nsect, lbal;
979 979
980 bfin_std_dev_select(ap, device); 980 bfin_dev_select(ap, device);
981 981
982 write_atapi_register(base, ATA_REG_NSECT, 0x55); 982 write_atapi_register(base, ATA_REG_NSECT, 0x55);
983 write_atapi_register(base, ATA_REG_LBAL, 0xaa); 983 write_atapi_register(base, ATA_REG_LBAL, 0xaa);
@@ -1014,7 +1014,7 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask)
1014 * BSY bit to clear 1014 * BSY bit to clear
1015 */ 1015 */
1016 if (dev0) 1016 if (dev0)
1017 ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT); 1017 ata_sff_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
1018 1018
1019 /* if device 1 was found in ata_devchk, wait for 1019 /* if device 1 was found in ata_devchk, wait for
1020 * register access, then wait for BSY to clear 1020 * register access, then wait for BSY to clear
@@ -1023,7 +1023,7 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask)
1023 while (dev1) { 1023 while (dev1) {
1024 u8 nsect, lbal; 1024 u8 nsect, lbal;
1025 1025
1026 bfin_std_dev_select(ap, 1); 1026 bfin_dev_select(ap, 1);
1027 nsect = read_atapi_register(base, ATA_REG_NSECT); 1027 nsect = read_atapi_register(base, ATA_REG_NSECT);
1028 lbal = read_atapi_register(base, ATA_REG_LBAL); 1028 lbal = read_atapi_register(base, ATA_REG_LBAL);
1029 if ((nsect == 1) && (lbal == 1)) 1029 if ((nsect == 1) && (lbal == 1))
@@ -1035,14 +1035,14 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask)
1035 msleep(50); /* give drive a breather */ 1035 msleep(50); /* give drive a breather */
1036 } 1036 }
1037 if (dev1) 1037 if (dev1)
1038 ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT); 1038 ata_sff_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
1039 1039
1040 /* is all this really necessary? */ 1040 /* is all this really necessary? */
1041 bfin_std_dev_select(ap, 0); 1041 bfin_dev_select(ap, 0);
1042 if (dev1) 1042 if (dev1)
1043 bfin_std_dev_select(ap, 1); 1043 bfin_dev_select(ap, 1);
1044 if (dev0) 1044 if (dev0)
1045 bfin_std_dev_select(ap, 0); 1045 bfin_dev_select(ap, 0);
1046} 1046}
1047 1047
1048/** 1048/**
@@ -1088,15 +1088,15 @@ static unsigned int bfin_bus_softreset(struct ata_port *ap,
1088} 1088}
1089 1089
1090/** 1090/**
1091 * bfin_std_softreset - reset host port via ATA SRST 1091 * bfin_softreset - reset host port via ATA SRST
1092 * @ap: port to reset 1092 * @ap: port to reset
1093 * @classes: resulting classes of attached devices 1093 * @classes: resulting classes of attached devices
1094 * 1094 *
1095 * Note: Original code is ata_std_softreset(). 1095 * Note: Original code is ata_sff_softreset().
1096 */ 1096 */
1097 1097
1098static int bfin_std_softreset(struct ata_link *link, unsigned int *classes, 1098static int bfin_softreset(struct ata_link *link, unsigned int *classes,
1099 unsigned long deadline) 1099 unsigned long deadline)
1100{ 1100{
1101 struct ata_port *ap = link->ap; 1101 struct ata_port *ap = link->ap;
1102 unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS; 1102 unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
@@ -1115,7 +1115,7 @@ static int bfin_std_softreset(struct ata_link *link, unsigned int *classes,
1115 devmask |= (1 << 1); 1115 devmask |= (1 << 1);
1116 1116
1117 /* select device 0 again */ 1117 /* select device 0 again */
1118 bfin_std_dev_select(ap, 0); 1118 bfin_dev_select(ap, 0);
1119 1119
1120 /* issue bus reset */ 1120 /* issue bus reset */
1121 err_mask = bfin_bus_softreset(ap, devmask); 1121 err_mask = bfin_bus_softreset(ap, devmask);
@@ -1126,10 +1126,10 @@ static int bfin_std_softreset(struct ata_link *link, unsigned int *classes,
1126 } 1126 }
1127 1127
1128 /* determine by signature whether we have ATA or ATAPI devices */ 1128 /* determine by signature whether we have ATA or ATAPI devices */
1129 classes[0] = ata_dev_try_classify(&ap->link.device[0], 1129 classes[0] = ata_sff_dev_classify(&ap->link.device[0],
1130 devmask & (1 << 0), &err); 1130 devmask & (1 << 0), &err);
1131 if (slave_possible && err != 0x81) 1131 if (slave_possible && err != 0x81)
1132 classes[1] = ata_dev_try_classify(&ap->link.device[1], 1132 classes[1] = ata_sff_dev_classify(&ap->link.device[1],
1133 devmask & (1 << 1), &err); 1133 devmask & (1 << 1), &err);
1134 1134
1135 out: 1135 out:
@@ -1167,7 +1167,7 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)
1167 * @buflen: buffer length 1167 * @buflen: buffer length
1168 * @write_data: read/write 1168 * @write_data: read/write
1169 * 1169 *
1170 * Note: Original code is ata_data_xfer(). 1170 * Note: Original code is ata_sff_data_xfer().
1171 */ 1171 */
1172 1172
1173static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf, 1173static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,
@@ -1206,7 +1206,7 @@ static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,
1206 * bfin_irq_clear - Clear ATAPI interrupt. 1206 * bfin_irq_clear - Clear ATAPI interrupt.
1207 * @ap: Port associated with this ATA transaction. 1207 * @ap: Port associated with this ATA transaction.
1208 * 1208 *
1209 * Note: Original code is ata_bmdma_irq_clear(). 1209 * Note: Original code is ata_sff_irq_clear().
1210 */ 1210 */
1211 1211
1212static void bfin_irq_clear(struct ata_port *ap) 1212static void bfin_irq_clear(struct ata_port *ap)
@@ -1223,7 +1223,7 @@ static void bfin_irq_clear(struct ata_port *ap)
1223 * bfin_irq_on - Enable interrupts on a port. 1223 * bfin_irq_on - Enable interrupts on a port.
1224 * @ap: Port on which interrupts are enabled. 1224 * @ap: Port on which interrupts are enabled.
1225 * 1225 *
1226 * Note: Original code is ata_irq_on(). 1226 * Note: Original code is ata_sff_irq_on().
1227 */ 1227 */
1228 1228
1229static unsigned char bfin_irq_on(struct ata_port *ap) 1229static unsigned char bfin_irq_on(struct ata_port *ap)
@@ -1244,13 +1244,13 @@ static unsigned char bfin_irq_on(struct ata_port *ap)
1244} 1244}
1245 1245
1246/** 1246/**
1247 * bfin_bmdma_freeze - Freeze DMA controller port 1247 * bfin_freeze - Freeze DMA controller port
1248 * @ap: port to freeze 1248 * @ap: port to freeze
1249 * 1249 *
1250 * Note: Original code is ata_bmdma_freeze(). 1250 * Note: Original code is ata_sff_freeze().
1251 */ 1251 */
1252 1252
1253static void bfin_bmdma_freeze(struct ata_port *ap) 1253static void bfin_freeze(struct ata_port *ap)
1254{ 1254{
1255 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr; 1255 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
1256 1256
@@ -1270,13 +1270,13 @@ static void bfin_bmdma_freeze(struct ata_port *ap)
1270} 1270}
1271 1271
1272/** 1272/**
1273 * bfin_bmdma_thaw - Thaw DMA controller port 1273 * bfin_thaw - Thaw DMA controller port
1274 * @ap: port to thaw 1274 * @ap: port to thaw
1275 * 1275 *
1276 * Note: Original code is ata_bmdma_thaw(). 1276 * Note: Original code is ata_sff_thaw().
1277 */ 1277 */
1278 1278
1279void bfin_bmdma_thaw(struct ata_port *ap) 1279void bfin_thaw(struct ata_port *ap)
1280{ 1280{
1281 bfin_check_status(ap); 1281 bfin_check_status(ap);
1282 bfin_irq_clear(ap); 1282 bfin_irq_clear(ap);
@@ -1284,14 +1284,14 @@ void bfin_bmdma_thaw(struct ata_port *ap)
1284} 1284}
1285 1285
1286/** 1286/**
1287 * bfin_std_postreset - standard postreset callback 1287 * bfin_postreset - standard postreset callback
1288 * @ap: the target ata_port 1288 * @ap: the target ata_port
1289 * @classes: classes of attached devices 1289 * @classes: classes of attached devices
1290 * 1290 *
1291 * Note: Original code is ata_std_postreset(). 1291 * Note: Original code is ata_sff_postreset().
1292 */ 1292 */
1293 1293
1294static void bfin_std_postreset(struct ata_link *link, unsigned int *classes) 1294static void bfin_postreset(struct ata_link *link, unsigned int *classes)
1295{ 1295{
1296 struct ata_port *ap = link->ap; 1296 struct ata_port *ap = link->ap;
1297 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr; 1297 void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
@@ -1301,9 +1301,9 @@ static void bfin_std_postreset(struct ata_link *link, unsigned int *classes)
1301 1301
1302 /* is double-select really necessary? */ 1302 /* is double-select really necessary? */
1303 if (classes[0] != ATA_DEV_NONE) 1303 if (classes[0] != ATA_DEV_NONE)
1304 bfin_std_dev_select(ap, 1); 1304 bfin_dev_select(ap, 1);
1305 if (classes[1] != ATA_DEV_NONE) 1305 if (classes[1] != ATA_DEV_NONE)
1306 bfin_std_dev_select(ap, 0); 1306 bfin_dev_select(ap, 0);
1307 1307
1308 /* bail out if no device is present */ 1308 /* bail out if no device is present */
1309 if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) { 1309 if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
@@ -1362,7 +1362,7 @@ static const struct ata_port_operations bfin_pata_ops = {
1362 .exec_command = bfin_exec_command, 1362 .exec_command = bfin_exec_command,
1363 .check_status = bfin_check_status, 1363 .check_status = bfin_check_status,
1364 .check_altstatus = bfin_check_altstatus, 1364 .check_altstatus = bfin_check_altstatus,
1365 .dev_select = bfin_std_dev_select, 1365 .dev_select = bfin_dev_select,
1366 1366
1367 .bmdma_setup = bfin_bmdma_setup, 1367 .bmdma_setup = bfin_bmdma_setup,
1368 .bmdma_start = bfin_bmdma_start, 1368 .bmdma_start = bfin_bmdma_start,
@@ -1372,10 +1372,10 @@ static const struct ata_port_operations bfin_pata_ops = {
1372 1372
1373 .qc_prep = ata_noop_qc_prep, 1373 .qc_prep = ata_noop_qc_prep,
1374 1374
1375 .freeze = bfin_bmdma_freeze, 1375 .freeze = bfin_freeze,
1376 .thaw = bfin_bmdma_thaw, 1376 .thaw = bfin_thaw,
1377 .softreset = bfin_std_softreset, 1377 .softreset = bfin_softreset,
1378 .postreset = bfin_std_postreset, 1378 .postreset = bfin_postreset,
1379 .post_internal_cmd = bfin_bmdma_stop, 1379 .post_internal_cmd = bfin_bmdma_stop,
1380 1380
1381 .irq_clear = bfin_irq_clear, 1381 .irq_clear = bfin_irq_clear,
@@ -1513,7 +1513,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
1513 } 1513 }
1514 1514
1515 if (ata_host_activate(host, platform_get_irq(pdev, 0), 1515 if (ata_host_activate(host, platform_get_irq(pdev, 0),
1516 ata_interrupt, IRQF_SHARED, &bfin_sht) != 0) { 1516 ata_sff_interrupt, IRQF_SHARED, &bfin_sht) != 0) {
1517 peripheral_free_list(atapi_io_port); 1517 peripheral_free_list(atapi_io_port);
1518 dev_err(&pdev->dev, "Fail to attach ATAPI device\n"); 1518 dev_err(&pdev->dev, "Fail to attach ATAPI device\n");
1519 return -ENODEV; 1519 return -ENODEV;
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 27219b00edf4..a907cf478891 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -107,8 +107,8 @@ static void cmd640_set_piomode(struct ata_port *ap, struct ata_device *adev)
107 pci_write_config_byte(pdev, arttim + 1, (t.active << 4) | t.recover); 107 pci_write_config_byte(pdev, arttim + 1, (t.active << 4) | t.recover);
108 } else { 108 } else {
109 /* Save the shared timings for channel, they will be loaded 109 /* Save the shared timings for channel, they will be loaded
110 by qc_issue_prot. Reloading the setup time is expensive 110 by qc_issue. Reloading the setup time is expensive so we
111 so we keep a merged one loaded */ 111 keep a merged one loaded */
112 pci_read_config_byte(pdev, ARTIM23, &reg); 112 pci_read_config_byte(pdev, ARTIM23, &reg);
113 reg &= 0x3F; 113 reg &= 0x3F;
114 reg |= t.setup; 114 reg |= t.setup;
@@ -119,14 +119,14 @@ static void cmd640_set_piomode(struct ata_port *ap, struct ata_device *adev)
119 119
120 120
121/** 121/**
122 * cmd640_qc_issue_prot - command preparation hook 122 * cmd640_qc_issue - command preparation hook
123 * @qc: Command to be issued 123 * @qc: Command to be issued
124 * 124 *
125 * Channel 1 has shared timings. We must reprogram the 125 * Channel 1 has shared timings. We must reprogram the
126 * clock each drive 2/3 switch we do. 126 * clock each drive 2/3 switch we do.
127 */ 127 */
128 128
129static unsigned int cmd640_qc_issue_prot(struct ata_queued_cmd *qc) 129static unsigned int cmd640_qc_issue(struct ata_queued_cmd *qc)
130{ 130{
131 struct ata_port *ap = qc->ap; 131 struct ata_port *ap = qc->ap;
132 struct ata_device *adev = qc->dev; 132 struct ata_device *adev = qc->dev;
@@ -137,7 +137,7 @@ static unsigned int cmd640_qc_issue_prot(struct ata_queued_cmd *qc)
137 pci_write_config_byte(pdev, DRWTIM23, timing->reg58[adev->devno]); 137 pci_write_config_byte(pdev, DRWTIM23, timing->reg58[adev->devno]);
138 timing->last = adev->devno; 138 timing->last = adev->devno;
139 } 139 }
140 return ata_qc_issue_prot(qc); 140 return ata_sff_qc_issue(qc);
141} 141}
142 142
143/** 143/**
@@ -172,8 +172,8 @@ static struct scsi_host_template cmd640_sht = {
172static struct ata_port_operations cmd640_port_ops = { 172static struct ata_port_operations cmd640_port_ops = {
173 .inherits = &ata_bmdma_port_ops, 173 .inherits = &ata_bmdma_port_ops,
174 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 174 /* In theory xfer_noirq is not needed once we kill the prefetcher */
175 .data_xfer = ata_data_xfer_noirq, 175 .data_xfer = ata_sff_data_xfer_noirq,
176 .qc_issue = cmd640_qc_issue_prot, 176 .qc_issue = cmd640_qc_issue,
177 .cable_detect = ata_cable_40wire, 177 .cable_detect = ata_cable_40wire,
178 .set_piomode = cmd640_set_piomode, 178 .set_piomode = cmd640_set_piomode,
179 .port_start = cmd640_port_start, 179 .port_start = cmd640_port_start,
@@ -224,7 +224,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
224 224
225 cmd640_hardware_init(pdev); 225 cmd640_hardware_init(pdev);
226 226
227 return ata_pci_init_one(pdev, ppi, &cmd640_sht, NULL); 227 return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL);
228} 228}
229 229
230#ifdef CONFIG_PM 230#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index f0e566623614..ddd09b7d98c9 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -349,7 +349,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
349 class_rev &= 0xFF; 349 class_rev &= 0xFF;
350 350
351 if (id->driver_data == 0) /* 643 */ 351 if (id->driver_data == 0) /* 643 */
352 ata_pci_clear_simplex(pdev); 352 ata_pci_bmdma_clear_simplex(pdev);
353 353
354 if (pdev->device == PCI_DEVICE_ID_CMD_646) { 354 if (pdev->device == PCI_DEVICE_ID_CMD_646) {
355 /* Does UDMA work ? */ 355 /* Does UDMA work ? */
@@ -373,7 +373,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
373 pci_write_config_byte(pdev, UDIDETCR0, 0xF0); 373 pci_write_config_byte(pdev, UDIDETCR0, 0xF0);
374#endif 374#endif
375 375
376 return ata_pci_init_one(pdev, ppi, &cmd64x_sht, NULL); 376 return ata_pci_sff_init_one(pdev, ppi, &cmd64x_sht, NULL);
377} 377}
378 378
379#ifdef CONFIG_PM 379#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 46d0ce32ee5a..1186bcd2781c 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -146,7 +146,7 @@ static struct scsi_host_template cs5520_sht = {
146 146
147static struct ata_port_operations cs5520_port_ops = { 147static struct ata_port_operations cs5520_port_ops = {
148 .inherits = &ata_bmdma_port_ops, 148 .inherits = &ata_bmdma_port_ops,
149 .qc_prep = ata_dumb_qc_prep, 149 .qc_prep = ata_sff_dumb_qc_prep,
150 .cable_detect = ata_cable_40wire, 150 .cable_detect = ata_cable_40wire,
151 .set_piomode = cs5520_set_piomode, 151 .set_piomode = cs5520_set_piomode,
152 .set_dmamode = cs5520_set_dmamode, 152 .set_dmamode = cs5520_set_dmamode,
@@ -227,7 +227,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
227 ioaddr->ctl_addr = iomap[1]; 227 ioaddr->ctl_addr = iomap[1];
228 ioaddr->altstatus_addr = iomap[1]; 228 ioaddr->altstatus_addr = iomap[1];
229 ioaddr->bmdma_addr = iomap[4]; 229 ioaddr->bmdma_addr = iomap[4];
230 ata_std_ports(ioaddr); 230 ata_sff_std_ports(ioaddr);
231 231
232 ata_port_desc(host->ports[0], 232 ata_port_desc(host->ports[0],
233 "cmd 0x%x ctl 0x%x", cmd_port[0], ctl_port[0]); 233 "cmd 0x%x ctl 0x%x", cmd_port[0], ctl_port[0]);
@@ -238,7 +238,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
238 ioaddr->ctl_addr = iomap[3]; 238 ioaddr->ctl_addr = iomap[3];
239 ioaddr->altstatus_addr = iomap[3]; 239 ioaddr->altstatus_addr = iomap[3];
240 ioaddr->bmdma_addr = iomap[4] + 8; 240 ioaddr->bmdma_addr = iomap[4] + 8;
241 ata_std_ports(ioaddr); 241 ata_sff_std_ports(ioaddr);
242 242
243 ata_port_desc(host->ports[1], 243 ata_port_desc(host->ports[1],
244 "cmd 0x%x ctl 0x%x", cmd_port[1], ctl_port[1]); 244 "cmd 0x%x ctl 0x%x", cmd_port[1], ctl_port[1]);
@@ -258,7 +258,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
258 continue; 258 continue;
259 259
260 rc = devm_request_irq(&pdev->dev, irq[ap->port_no], 260 rc = devm_request_irq(&pdev->dev, irq[ap->port_no],
261 ata_interrupt, 0, DRV_NAME, host); 261 ata_sff_interrupt, 0, DRV_NAME, host);
262 if (rc) 262 if (rc)
263 return rc; 263 return rc;
264 264
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index ac3ad55d7c3c..744beebaaf49 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -133,7 +133,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev)
133} 133}
134 134
135/** 135/**
136 * cs5530_qc_issue_prot - command issue 136 * cs5530_qc_issue - command issue
137 * @qc: command pending 137 * @qc: command pending
138 * 138 *
139 * Called when the libata layer is about to issue a command. We wrap 139 * Called when the libata layer is about to issue a command. We wrap
@@ -142,7 +142,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev)
142 * one MWDMA/UDMA bit. 142 * one MWDMA/UDMA bit.
143 */ 143 */
144 144
145static unsigned int cs5530_qc_issue_prot(struct ata_queued_cmd *qc) 145static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
146{ 146{
147 struct ata_port *ap = qc->ap; 147 struct ata_port *ap = qc->ap;
148 struct ata_device *adev = qc->dev; 148 struct ata_device *adev = qc->dev;
@@ -157,7 +157,7 @@ static unsigned int cs5530_qc_issue_prot(struct ata_queued_cmd *qc)
157 cs5530_set_dmamode(ap, adev); 157 cs5530_set_dmamode(ap, adev);
158 } 158 }
159 159
160 return ata_qc_issue_prot(qc); 160 return ata_sff_qc_issue(qc);
161} 161}
162 162
163static struct scsi_host_template cs5530_sht = { 163static struct scsi_host_template cs5530_sht = {
@@ -168,8 +168,8 @@ static struct scsi_host_template cs5530_sht = {
168static struct ata_port_operations cs5530_port_ops = { 168static struct ata_port_operations cs5530_port_ops = {
169 .inherits = &ata_bmdma_port_ops, 169 .inherits = &ata_bmdma_port_ops,
170 170
171 .qc_prep = ata_dumb_qc_prep, 171 .qc_prep = ata_sff_dumb_qc_prep,
172 .qc_issue = cs5530_qc_issue_prot, 172 .qc_issue = cs5530_qc_issue,
173 173
174 .cable_detect = ata_cable_40wire, 174 .cable_detect = ata_cable_40wire,
175 .set_piomode = cs5530_set_piomode, 175 .set_piomode = cs5530_set_piomode,
@@ -325,7 +325,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
325 ppi[1] = &info_palmax_secondary; 325 ppi[1] = &info_palmax_secondary;
326 326
327 /* Now kick off ATA set up */ 327 /* Now kick off ATA set up */
328 return ata_pci_init_one(pdev, ppi, &cs5530_sht, NULL); 328 return ata_pci_sff_init_one(pdev, ppi, &cs5530_sht, NULL);
329} 329}
330 330
331#ifdef CONFIG_PM 331#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 5c0762ebf58c..f1b6556f0483 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -199,7 +199,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
199 rdmsr(ATAC_CH0D1_PIO, timings, dummy); 199 rdmsr(ATAC_CH0D1_PIO, timings, dummy);
200 if (CS5535_BAD_PIO(timings)) 200 if (CS5535_BAD_PIO(timings))
201 wrmsr(ATAC_CH0D1_PIO, 0xF7F4F7F4UL, 0); 201 wrmsr(ATAC_CH0D1_PIO, 0xF7F4F7F4UL, 0);
202 return ata_pci_init_one(dev, ppi, &cs5535_sht, NULL); 202 return ata_pci_sff_init_one(dev, ppi, &cs5535_sht, NULL);
203} 203}
204 204
205static const struct pci_device_id cs5535[] = { 205static const struct pci_device_id cs5535[] = {
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 2d34b9145dcb..73f8332cb679 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -261,7 +261,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)
261 return -ENODEV; 261 return -ENODEV;
262 } 262 }
263 263
264 return ata_pci_init_one(dev, ppi, &cs5536_sht, NULL); 264 return ata_pci_sff_init_one(dev, ppi, &cs5536_sht, NULL);
265} 265}
266 266
267static const struct pci_device_id cs5536[] = { 267static const struct pci_device_id cs5536[] = {
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index ae14969e1dfe..a9c3218e22fd 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -136,7 +136,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *i
136 if (PCI_FUNC(pdev->devfn) != 1) 136 if (PCI_FUNC(pdev->devfn) != 1)
137 return -ENODEV; 137 return -ENODEV;
138 138
139 return ata_pci_init_one(pdev, ppi, &cy82c693_sht, NULL); 139 return ata_pci_sff_init_one(pdev, ppi, &cy82c693_sht, NULL);
140} 140}
141 141
142static const struct pci_device_id cy82c693[] = { 142static const struct pci_device_id cy82c693[] = {
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 1d839a57068e..9fba82976ba6 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -45,7 +45,7 @@ static int efar_pre_reset(struct ata_link *link, unsigned long deadline)
45 if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) 45 if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no]))
46 return -ENOENT; 46 return -ENOENT;
47 47
48 return ata_std_prereset(link, deadline); 48 return ata_sff_prereset(link, deadline);
49} 49}
50 50
51/** 51/**
@@ -262,7 +262,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
262 dev_printk(KERN_DEBUG, &pdev->dev, 262 dev_printk(KERN_DEBUG, &pdev->dev,
263 "version " DRV_VERSION "\n"); 263 "version " DRV_VERSION "\n");
264 264
265 return ata_pci_init_one(pdev, ppi, &efar_sht, NULL); 265 return ata_pci_sff_init_one(pdev, ppi, &efar_sht, NULL);
266} 266}
267 267
268static const struct pci_device_id efar_pci_tbl[] = { 268static const struct pci_device_id efar_pci_tbl[] = {
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index c2d4923d4db7..f2b83eabc7c7 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -184,7 +184,7 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask)
184 if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4)) 184 if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4))
185 mask &= ~(0xF0 << ATA_SHIFT_UDMA); 185 mask &= ~(0xF0 << ATA_SHIFT_UDMA);
186 } 186 }
187 return ata_pci_default_filter(adev, mask); 187 return ata_bmdma_mode_filter(adev, mask);
188} 188}
189 189
190/** 190/**
@@ -393,7 +393,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
393 break; 393 break;
394 } 394 }
395 /* Now kick off ATA set up */ 395 /* Now kick off ATA set up */
396 return ata_pci_init_one(dev, ppi, &hpt36x_sht, hpriv); 396 return ata_pci_sff_init_one(dev, ppi, &hpt36x_sht, hpriv);
397} 397}
398 398
399#ifdef CONFIG_PM 399#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index c10fcd31418d..42163998de9a 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -283,7 +283,7 @@ static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask)
283 if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) 283 if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
284 mask &= ~(0xE0 << ATA_SHIFT_UDMA); 284 mask &= ~(0xE0 << ATA_SHIFT_UDMA);
285 } 285 }
286 return ata_pci_default_filter(adev, mask); 286 return ata_bmdma_mode_filter(adev, mask);
287} 287}
288 288
289/** 289/**
@@ -299,7 +299,7 @@ static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
299 if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) 299 if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
300 mask &= ~(0xE0 << ATA_SHIFT_UDMA); 300 mask &= ~(0xE0 << ATA_SHIFT_UDMA);
301 } 301 }
302 return ata_pci_default_filter(adev, mask); 302 return ata_bmdma_mode_filter(adev, mask);
303} 303}
304 304
305/** 305/**
@@ -338,7 +338,7 @@ static int hpt37x_pre_reset(struct ata_link *link, unsigned long deadline)
338 pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); 338 pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
339 udelay(100); 339 udelay(100);
340 340
341 return ata_std_prereset(link, deadline); 341 return ata_sff_prereset(link, deadline);
342} 342}
343 343
344static int hpt374_fn1_pre_reset(struct ata_link *link, unsigned long deadline) 344static int hpt374_fn1_pre_reset(struct ata_link *link, unsigned long deadline)
@@ -374,7 +374,7 @@ static int hpt374_fn1_pre_reset(struct ata_link *link, unsigned long deadline)
374 pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); 374 pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
375 udelay(100); 375 udelay(100);
376 376
377 return ata_std_prereset(link, deadline); 377 return ata_sff_prereset(link, deadline);
378} 378}
379 379
380/** 380/**
@@ -1019,7 +1019,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
1019 } 1019 }
1020 1020
1021 /* Now kick off ATA set up */ 1021 /* Now kick off ATA set up */
1022 return ata_pci_init_one(dev, ppi, &hpt37x_sht, private_data); 1022 return ata_pci_sff_init_one(dev, ppi, &hpt37x_sht, private_data);
1023} 1023}
1024 1024
1025static const struct pci_device_id hpt37x[] = { 1025static const struct pci_device_id hpt37x[] = {
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index cd44ee3d3cc1..d5c9fd7b82bb 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -156,7 +156,7 @@ static int hpt3x2n_pre_reset(struct ata_link *link, unsigned long deadline)
156 pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); 156 pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
157 udelay(100); 157 udelay(100);
158 158
159 return ata_std_prereset(link, deadline); 159 return ata_sff_prereset(link, deadline);
160} 160}
161 161
162/** 162/**
@@ -308,7 +308,7 @@ static int hpt3x2n_use_dpll(struct ata_port *ap, int writing)
308 return 0; 308 return 0;
309} 309}
310 310
311static unsigned int hpt3x2n_qc_issue_prot(struct ata_queued_cmd *qc) 311static unsigned int hpt3x2n_qc_issue(struct ata_queued_cmd *qc)
312{ 312{
313 struct ata_taskfile *tf = &qc->tf; 313 struct ata_taskfile *tf = &qc->tf;
314 struct ata_port *ap = qc->ap; 314 struct ata_port *ap = qc->ap;
@@ -323,7 +323,7 @@ static unsigned int hpt3x2n_qc_issue_prot(struct ata_queued_cmd *qc)
323 hpt3x2n_set_clock(ap, 0x23); 323 hpt3x2n_set_clock(ap, 0x23);
324 } 324 }
325 } 325 }
326 return ata_qc_issue_prot(qc); 326 return ata_sff_qc_issue(qc);
327} 327}
328 328
329static struct scsi_host_template hpt3x2n_sht = { 329static struct scsi_host_template hpt3x2n_sht = {
@@ -338,7 +338,7 @@ static struct ata_port_operations hpt3x2n_port_ops = {
338 .inherits = &ata_bmdma_port_ops, 338 .inherits = &ata_bmdma_port_ops,
339 339
340 .bmdma_stop = hpt3x2n_bmdma_stop, 340 .bmdma_stop = hpt3x2n_bmdma_stop,
341 .qc_issue = hpt3x2n_qc_issue_prot, 341 .qc_issue = hpt3x2n_qc_issue,
342 342
343 .cable_detect = hpt3x2n_cable_detect, 343 .cable_detect = hpt3x2n_cable_detect,
344 .set_piomode = hpt3x2n_set_piomode, 344 .set_piomode = hpt3x2n_set_piomode,
@@ -554,7 +554,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
554 } 554 }
555 555
556 /* Now kick off ATA set up */ 556 /* Now kick off ATA set up */
557 return ata_pci_init_one(dev, ppi, &hpt3x2n_sht, hpriv); 557 return ata_pci_sff_init_one(dev, ppi, &hpt3x2n_sht, hpriv);
558} 558}
559 559
560static const struct pci_device_id hpt3x2n[] = { 560static const struct pci_device_id hpt3x2n[] = {
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index 8857d029ac2e..f11a320337c0 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -202,15 +202,15 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
202 ioaddr->altstatus_addr = 202 ioaddr->altstatus_addr =
203 ioaddr->ctl_addr = base + offset_ctl[i]; 203 ioaddr->ctl_addr = base + offset_ctl[i];
204 ioaddr->scr_addr = NULL; 204 ioaddr->scr_addr = NULL;
205 ata_std_ports(ioaddr); 205 ata_sff_std_ports(ioaddr);
206 ioaddr->bmdma_addr = base + 8 * i; 206 ioaddr->bmdma_addr = base + 8 * i;
207 207
208 ata_port_pbar_desc(ap, 4, -1, "ioport"); 208 ata_port_pbar_desc(ap, 4, -1, "ioport");
209 ata_port_pbar_desc(ap, 4, offset_cmd[i], "cmd"); 209 ata_port_pbar_desc(ap, 4, offset_cmd[i], "cmd");
210 } 210 }
211 pci_set_master(pdev); 211 pci_set_master(pdev);
212 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 212 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
213 &hpt3x3_sht); 213 IRQF_SHARED, &hpt3x3_sht);
214} 214}
215 215
216#ifdef CONFIG_PM 216#ifdef CONFIG_PM
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
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 085913ec6f68..6a111baab523 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -50,7 +50,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
50 50
51 if (pnp_irq_valid(idev, 0)) { 51 if (pnp_irq_valid(idev, 0)) {
52 irq = pnp_irq(idev, 0); 52 irq = pnp_irq(idev, 0);
53 handler = ata_interrupt; 53 handler = ata_sff_interrupt;
54 } 54 }
55 55
56 /* allocate host */ 56 /* allocate host */
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
78 ap->ioaddr.ctl_addr = ctl_addr; 78 ap->ioaddr.ctl_addr = ctl_addr;
79 } 79 }
80 80
81 ata_std_ports(&ap->ioaddr); 81 ata_sff_std_ports(&ap->ioaddr);
82 82
83 ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx", 83 ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx",
84 (unsigned long long)pnp_port_start(idev, 0), 84 (unsigned long long)pnp_port_start(idev, 0),
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index 84ab89e8a247..c113d7c079c8 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -40,7 +40,7 @@ static int it8213_pre_reset(struct ata_link *link, unsigned long deadline)
40 if (!pci_test_config_bits(pdev, &it8213_enable_bits[ap->port_no])) 40 if (!pci_test_config_bits(pdev, &it8213_enable_bits[ap->port_no]))
41 return -ENOENT; 41 return -ENOENT;
42 42
43 return ata_std_prereset(link, deadline); 43 return ata_sff_prereset(link, deadline);
44} 44}
45 45
46/** 46/**
@@ -274,7 +274,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en
274 dev_printk(KERN_DEBUG, &pdev->dev, 274 dev_printk(KERN_DEBUG, &pdev->dev,
275 "version " DRV_VERSION "\n"); 275 "version " DRV_VERSION "\n");
276 276
277 return ata_pci_init_one(pdev, ppi, &it8213_sht, NULL); 277 return ata_pci_sff_init_one(pdev, ppi, &it8213_sht, NULL);
278} 278}
279 279
280static const struct pci_device_id it8213_pci_tbl[] = { 280static const struct pci_device_id it8213_pci_tbl[] = {
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 6a8a4ddf5bfe..88e37cfcfc4f 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -395,11 +395,11 @@ static void it821x_passthru_dev_select(struct ata_port *ap,
395 it821x_program(ap, adev, itdev->pio[adev->devno]); 395 it821x_program(ap, adev, itdev->pio[adev->devno]);
396 itdev->last_device = device; 396 itdev->last_device = device;
397 } 397 }
398 ata_std_dev_select(ap, device); 398 ata_sff_dev_select(ap, device);
399} 399}
400 400
401/** 401/**
402 * it821x_smart_qc_issue_prot - wrap qc issue prot 402 * it821x_smart_qc_issue - wrap qc issue prot
403 * @qc: command 403 * @qc: command
404 * 404 *
405 * Wrap the command issue sequence for the IT821x. We need to 405 * Wrap the command issue sequence for the IT821x. We need to
@@ -407,7 +407,7 @@ static void it821x_passthru_dev_select(struct ata_port *ap,
407 * usual happenings kick off 407 * usual happenings kick off
408 */ 408 */
409 409
410static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc) 410static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc)
411{ 411{
412 switch(qc->tf.command) 412 switch(qc->tf.command)
413 { 413 {
@@ -427,14 +427,14 @@ static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc)
427 case ATA_CMD_ID_ATA: 427 case ATA_CMD_ID_ATA:
428 /* Arguably should just no-op this one */ 428 /* Arguably should just no-op this one */
429 case ATA_CMD_SET_FEATURES: 429 case ATA_CMD_SET_FEATURES:
430 return ata_qc_issue_prot(qc); 430 return ata_sff_qc_issue(qc);
431 } 431 }
432 printk(KERN_DEBUG "it821x: can't process command 0x%02X\n", qc->tf.command); 432 printk(KERN_DEBUG "it821x: can't process command 0x%02X\n", qc->tf.command);
433 return AC_ERR_DEV; 433 return AC_ERR_DEV;
434} 434}
435 435
436/** 436/**
437 * it821x_passthru_qc_issue_prot - wrap qc issue prot 437 * it821x_passthru_qc_issue - wrap qc issue prot
438 * @qc: command 438 * @qc: command
439 * 439 *
440 * Wrap the command issue sequence for the IT821x. We need to 440 * Wrap the command issue sequence for the IT821x. We need to
@@ -442,10 +442,10 @@ static unsigned int it821x_smart_qc_issue_prot(struct ata_queued_cmd *qc)
442 * usual happenings kick off 442 * usual happenings kick off
443 */ 443 */
444 444
445static unsigned int it821x_passthru_qc_issue_prot(struct ata_queued_cmd *qc) 445static unsigned int it821x_passthru_qc_issue(struct ata_queued_cmd *qc)
446{ 446{
447 it821x_passthru_dev_select(qc->ap, qc->dev->devno); 447 it821x_passthru_dev_select(qc->ap, qc->dev->devno);
448 return ata_qc_issue_prot(qc); 448 return ata_sff_qc_issue(qc);
449} 449}
450 450
451/** 451/**
@@ -639,7 +639,7 @@ static struct ata_port_operations it821x_smart_port_ops = {
639 .inherits = &ata_bmdma_port_ops, 639 .inherits = &ata_bmdma_port_ops,
640 640
641 .check_atapi_dma= it821x_check_atapi_dma, 641 .check_atapi_dma= it821x_check_atapi_dma,
642 .qc_issue = it821x_smart_qc_issue_prot, 642 .qc_issue = it821x_smart_qc_issue,
643 643
644 .cable_detect = it821x_ident_hack, 644 .cable_detect = it821x_ident_hack,
645 .set_mode = it821x_smart_set_mode, 645 .set_mode = it821x_smart_set_mode,
@@ -655,7 +655,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
655 .dev_select = it821x_passthru_dev_select, 655 .dev_select = it821x_passthru_dev_select,
656 .bmdma_start = it821x_passthru_bmdma_start, 656 .bmdma_start = it821x_passthru_bmdma_start,
657 .bmdma_stop = it821x_passthru_bmdma_stop, 657 .bmdma_stop = it821x_passthru_bmdma_stop,
658 .qc_issue = it821x_passthru_qc_issue_prot, 658 .qc_issue = it821x_passthru_qc_issue,
659 659
660 .cable_detect = ata_cable_unknown, 660 .cable_detect = ata_cable_unknown,
661 .set_piomode = it821x_passthru_set_piomode, 661 .set_piomode = it821x_passthru_set_piomode,
@@ -722,7 +722,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
722 else 722 else
723 ppi[0] = &info_smart; 723 ppi[0] = &info_smart;
724 724
725 return ata_pci_init_one(pdev, ppi, &it821x_sht, NULL); 725 return ata_pci_sff_init_one(pdev, ppi, &it821x_sht, NULL);
726} 726}
727 727
728#ifdef CONFIG_PM 728#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index d02629aa20da..283a8fba79b3 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -110,7 +110,7 @@ static void ixp4xx_setup_port(struct ata_port *ap,
110 ioaddr->altstatus_addr = data->cs1 + 0x06; 110 ioaddr->altstatus_addr = data->cs1 + 0x06;
111 ioaddr->ctl_addr = data->cs1 + 0x06; 111 ioaddr->ctl_addr = data->cs1 + 0x06;
112 112
113 ata_std_ports(ioaddr); 113 ata_sff_std_ports(ioaddr);
114 114
115#ifndef __ARMEB__ 115#ifndef __ARMEB__
116 116
@@ -186,7 +186,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
186 dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n"); 186 dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
187 187
188 /* activate host */ 188 /* activate host */
189 return ata_host_activate(host, irq, ata_interrupt, 0, &ixp4xx_sht); 189 return ata_host_activate(host, irq, ata_sff_interrupt, 0, &ixp4xx_sht);
190} 190}
191 191
192static __devexit int ixp4xx_pata_remove(struct platform_device *dev) 192static __devexit int ixp4xx_pata_remove(struct platform_device *dev)
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 317f3474e0ba..73b7596816b4 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -102,7 +102,7 @@ static int jmicron_pre_reset(struct ata_link *link, unsigned long deadline)
102 ap->cbl = ATA_CBL_SATA; 102 ap->cbl = ATA_CBL_SATA;
103 break; 103 break;
104 } 104 }
105 return ata_std_prereset(link, deadline); 105 return ata_sff_prereset(link, deadline);
106} 106}
107 107
108/* No PIO or DMA methods needed for this device */ 108/* No PIO or DMA methods needed for this device */
@@ -144,7 +144,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
144 }; 144 };
145 const struct ata_port_info *ppi[] = { &info, NULL }; 145 const struct ata_port_info *ppi[] = { &info, NULL };
146 146
147 return ata_pci_init_one(pdev, ppi, &jmicron_sht, NULL); 147 return ata_pci_sff_init_one(pdev, ppi, &jmicron_sht, NULL);
148} 148}
149 149
150static const struct pci_device_id jmicron_pci_tbl[] = { 150static const struct pci_device_id jmicron_pci_tbl[] = {
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 2474068596f4..f13f10a55ef3 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -226,12 +226,12 @@ static const struct ata_port_operations legacy_base_port_ops = {
226 226
227static struct ata_port_operations simple_port_ops = { 227static struct ata_port_operations simple_port_ops = {
228 .inherits = &legacy_base_port_ops, 228 .inherits = &legacy_base_port_ops,
229 .data_xfer = ata_data_xfer_noirq, 229 .data_xfer = ata_sff_data_xfer_noirq,
230}; 230};
231 231
232static struct ata_port_operations legacy_port_ops = { 232static struct ata_port_operations legacy_port_ops = {
233 .inherits = &legacy_base_port_ops, 233 .inherits = &legacy_base_port_ops,
234 .data_xfer = ata_data_xfer_noirq, 234 .data_xfer = ata_sff_data_xfer_noirq,
235 .set_mode = legacy_set_mode, 235 .set_mode = legacy_set_mode,
236}; 236};
237 237
@@ -317,7 +317,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
317 } 317 }
318 local_irq_restore(flags); 318 local_irq_restore(flags);
319 } else 319 } else
320 buflen = ata_data_xfer_noirq(dev, buf, buflen, rw); 320 buflen = ata_sff_data_xfer_noirq(dev, buf, buflen, rw);
321 321
322 return buflen; 322 return buflen;
323} 323}
@@ -579,7 +579,7 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev)
579} 579}
580 580
581/** 581/**
582 * opt82c465mv_qc_issue_prot - command issue 582 * opt82c465mv_qc_issue - command issue
583 * @qc: command pending 583 * @qc: command pending
584 * 584 *
585 * Called when the libata layer is about to issue a command. We wrap 585 * Called when the libata layer is about to issue a command. We wrap
@@ -593,7 +593,7 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev)
593 * FIXME: dual channel needs ->serialize support 593 * FIXME: dual channel needs ->serialize support
594 */ 594 */
595 595
596static unsigned int opti82c46x_qc_issue_prot(struct ata_queued_cmd *qc) 596static unsigned int opti82c46x_qc_issue(struct ata_queued_cmd *qc)
597{ 597{
598 struct ata_port *ap = qc->ap; 598 struct ata_port *ap = qc->ap;
599 struct ata_device *adev = qc->dev; 599 struct ata_device *adev = qc->dev;
@@ -604,13 +604,13 @@ static unsigned int opti82c46x_qc_issue_prot(struct ata_queued_cmd *qc)
604 && ap->host->private_data != NULL) 604 && ap->host->private_data != NULL)
605 opti82c46x_set_piomode(ap, adev); 605 opti82c46x_set_piomode(ap, adev);
606 606
607 return ata_qc_issue_prot(qc); 607 return ata_sff_qc_issue(qc);
608} 608}
609 609
610static struct ata_port_operations opti82c46x_port_ops = { 610static struct ata_port_operations opti82c46x_port_ops = {
611 .inherits = &legacy_base_port_ops, 611 .inherits = &legacy_base_port_ops,
612 .set_piomode = opti82c46x_set_piomode, 612 .set_piomode = opti82c46x_set_piomode,
613 .qc_issue = opti82c46x_qc_issue_prot, 613 .qc_issue = opti82c46x_qc_issue,
614}; 614};
615 615
616static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev) 616static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
@@ -644,7 +644,7 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
644 * @irq: interrupt line 644 * @irq: interrupt line
645 * 645 *
646 * In dual channel mode the 6580 has one clock per channel and we have 646 * In dual channel mode the 6580 has one clock per channel and we have
647 * to software clockswitch in qc_issue_prot. 647 * to software clockswitch in qc_issue.
648 */ 648 */
649 649
650static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev) 650static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)
@@ -710,14 +710,14 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
710} 710}
711 711
712/** 712/**
713 * qdi_qc_issue_prot - command issue 713 * qdi_qc_issue - command issue
714 * @qc: command pending 714 * @qc: command pending
715 * 715 *
716 * Called when the libata layer is about to issue a command. We wrap 716 * Called when the libata layer is about to issue a command. We wrap
717 * this interface so that we can load the correct ATA timings. 717 * this interface so that we can load the correct ATA timings.
718 */ 718 */
719 719
720static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc) 720static unsigned int qdi_qc_issue(struct ata_queued_cmd *qc)
721{ 721{
722 struct ata_port *ap = qc->ap; 722 struct ata_port *ap = qc->ap;
723 struct ata_device *adev = qc->dev; 723 struct ata_device *adev = qc->dev;
@@ -730,7 +730,7 @@ static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
730 2 * ap->port_no); 730 2 * ap->port_no);
731 } 731 }
732 } 732 }
733 return ata_qc_issue_prot(qc); 733 return ata_sff_qc_issue(qc);
734} 734}
735 735
736static unsigned int vlb32_data_xfer(struct ata_device *adev, unsigned char *buf, 736static unsigned int vlb32_data_xfer(struct ata_device *adev, unsigned char *buf,
@@ -759,7 +759,7 @@ static unsigned int vlb32_data_xfer(struct ata_device *adev, unsigned char *buf,
759 } 759 }
760 return (buflen + 3) & ~3; 760 return (buflen + 3) & ~3;
761 } else 761 } else
762 return ata_data_xfer(adev, buf, buflen, rw); 762 return ata_sff_data_xfer(adev, buf, buflen, rw);
763} 763}
764 764
765static int qdi_port(struct platform_device *dev, 765static int qdi_port(struct platform_device *dev,
@@ -774,7 +774,7 @@ static int qdi_port(struct platform_device *dev,
774static struct ata_port_operations qdi6500_port_ops = { 774static struct ata_port_operations qdi6500_port_ops = {
775 .inherits = &legacy_base_port_ops, 775 .inherits = &legacy_base_port_ops,
776 .set_piomode = qdi6500_set_piomode, 776 .set_piomode = qdi6500_set_piomode,
777 .qc_issue = qdi_qc_issue_prot, 777 .qc_issue = qdi_qc_issue,
778 .data_xfer = vlb32_data_xfer, 778 .data_xfer = vlb32_data_xfer,
779}; 779};
780 780
@@ -1016,13 +1016,13 @@ static __init int legacy_init_one(struct legacy_probe *probe)
1016 ap->ioaddr.cmd_addr = io_addr; 1016 ap->ioaddr.cmd_addr = io_addr;
1017 ap->ioaddr.altstatus_addr = ctrl_addr; 1017 ap->ioaddr.altstatus_addr = ctrl_addr;
1018 ap->ioaddr.ctl_addr = ctrl_addr; 1018 ap->ioaddr.ctl_addr = ctrl_addr;
1019 ata_std_ports(&ap->ioaddr); 1019 ata_sff_std_ports(&ap->ioaddr);
1020 ap->host->private_data = ld; 1020 ap->host->private_data = ld;
1021 1021
1022 ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io, io + 0x0206); 1022 ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io, io + 0x0206);
1023 1023
1024 ret = ata_host_activate(host, probe->irq, ata_interrupt, 0, 1024 ret = ata_host_activate(host, probe->irq, ata_sff_interrupt, 0,
1025 &legacy_sht); 1025 &legacy_sht);
1026 if (ret) 1026 if (ret)
1027 goto fail; 1027 goto fail;
1028 ld->platform_dev = pdev; 1028 ld->platform_dev = pdev;
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index d38e64cd6097..24a011b25024 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -55,7 +55,7 @@ static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)
55 (!(devices & 0x10))) /* PATA enable ? */ 55 (!(devices & 0x10))) /* PATA enable ? */
56 return -ENOENT; 56 return -ENOENT;
57 57
58 return ata_std_prereset(link, deadline); 58 return ata_sff_prereset(link, deadline);
59} 59}
60 60
61static int marvell_cable_detect(struct ata_port *ap) 61static int marvell_cable_detect(struct ata_port *ap)
@@ -128,7 +128,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
128 if (pdev->device == 0x6101) 128 if (pdev->device == 0x6101)
129 ppi[1] = &ata_dummy_port_info; 129 ppi[1] = &ata_dummy_port_info;
130 130
131 return ata_pci_init_one(pdev, ppi, &marvell_sht, NULL); 131 return ata_pci_sff_init_one(pdev, ppi, &marvell_sht, NULL);
132} 132}
133 133
134static const struct pci_device_id marvell_pci_tbl[] = { 134static const struct pci_device_id marvell_pci_tbl[] = {
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index fec93196710e..5d1d32a39c4d 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -252,7 +252,7 @@ mpc52xx_ata_dev_select(struct ata_port *ap, unsigned int device)
252 if (device != priv->csel) 252 if (device != priv->csel)
253 mpc52xx_ata_apply_timings(priv, device); 253 mpc52xx_ata_apply_timings(priv, device);
254 254
255 ata_std_dev_select(ap,device); 255 ata_sff_dev_select(ap,device);
256} 256}
257 257
258static struct scsi_host_template mpc52xx_ata_sht = { 258static struct scsi_host_template mpc52xx_ata_sht = {
@@ -305,7 +305,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,
305 ata_port_desc(ap, "ata_regs 0x%lx", raw_ata_regs); 305 ata_port_desc(ap, "ata_regs 0x%lx", raw_ata_regs);
306 306
307 /* activate host */ 307 /* activate host */
308 return ata_host_activate(host, priv->ata_irq, ata_interrupt, 0, 308 return ata_host_activate(host, priv->ata_irq, ata_sff_interrupt, 0,
309 &mpc52xx_ata_sht); 309 &mpc52xx_ata_sht);
310} 310}
311 311
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 1b9d0d412ebf..7d7e3fdab71f 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -55,7 +55,7 @@ static int mpiix_pre_reset(struct ata_link *link, unsigned long deadline)
55 if (!pci_test_config_bits(pdev, &mpiix_enable_bits)) 55 if (!pci_test_config_bits(pdev, &mpiix_enable_bits))
56 return -ENOENT; 56 return -ENOENT;
57 57
58 return ata_std_prereset(link, deadline); 58 return ata_sff_prereset(link, deadline);
59} 59}
60 60
61/** 61/**
@@ -69,8 +69,8 @@ static int mpiix_pre_reset(struct ata_link *link, unsigned long deadline)
69 * 69 *
70 * This would get very ugly because we can only program timing for one 70 * This would get very ugly because we can only program timing for one
71 * device at a time, the other gets PIO0. Fortunately libata calls 71 * device at a time, the other gets PIO0. Fortunately libata calls
72 * our qc_issue_prot command before a command is issued so we can 72 * our qc_issue command before a command is issued so we can flip the
73 * flip the timings back and forth to reduce the pain. 73 * timings back and forth to reduce the pain.
74 */ 74 */
75 75
76static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev) 76static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
@@ -110,7 +110,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
110} 110}
111 111
112/** 112/**
113 * mpiix_qc_issue_prot - command issue 113 * mpiix_qc_issue - command issue
114 * @qc: command pending 114 * @qc: command pending
115 * 115 *
116 * Called when the libata layer is about to issue a command. We wrap 116 * Called when the libata layer is about to issue a command. We wrap
@@ -120,7 +120,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
120 * be made PIO0. 120 * be made PIO0.
121 */ 121 */
122 122
123static unsigned int mpiix_qc_issue_prot(struct ata_queued_cmd *qc) 123static unsigned int mpiix_qc_issue(struct ata_queued_cmd *qc)
124{ 124{
125 struct ata_port *ap = qc->ap; 125 struct ata_port *ap = qc->ap;
126 struct ata_device *adev = qc->dev; 126 struct ata_device *adev = qc->dev;
@@ -133,7 +133,7 @@ static unsigned int mpiix_qc_issue_prot(struct ata_queued_cmd *qc)
133 if (adev->pio_mode && adev != ap->private_data) 133 if (adev->pio_mode && adev != ap->private_data)
134 mpiix_set_piomode(ap, adev); 134 mpiix_set_piomode(ap, adev);
135 135
136 return ata_qc_issue_prot(qc); 136 return ata_sff_qc_issue(qc);
137} 137}
138 138
139static struct scsi_host_template mpiix_sht = { 139static struct scsi_host_template mpiix_sht = {
@@ -142,7 +142,7 @@ static struct scsi_host_template mpiix_sht = {
142 142
143static struct ata_port_operations mpiix_port_ops = { 143static struct ata_port_operations mpiix_port_ops = {
144 .inherits = &ata_sff_port_ops, 144 .inherits = &ata_sff_port_ops,
145 .qc_issue = mpiix_qc_issue_prot, 145 .qc_issue = mpiix_qc_issue,
146 .cable_detect = ata_cable_40wire, 146 .cable_detect = ata_cable_40wire,
147 .set_piomode = mpiix_set_piomode, 147 .set_piomode = mpiix_set_piomode,
148 .prereset = mpiix_pre_reset, 148 .prereset = mpiix_pre_reset,
@@ -207,10 +207,10 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
207 ap->ioaddr.altstatus_addr = ctl_addr; 207 ap->ioaddr.altstatus_addr = ctl_addr;
208 208
209 /* Let libata fill in the port details */ 209 /* Let libata fill in the port details */
210 ata_std_ports(&ap->ioaddr); 210 ata_sff_std_ports(&ap->ioaddr);
211 211
212 /* activate host */ 212 /* activate host */
213 return ata_host_activate(host, irq, ata_interrupt, IRQF_SHARED, 213 return ata_host_activate(host, irq, ata_sff_interrupt, IRQF_SHARED,
214 &mpiix_sht); 214 &mpiix_sht);
215} 215}
216 216
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 349182840d24..d9719c8b9dbe 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -68,10 +68,10 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
68 return rc; 68 return rc;
69 69
70 /* Any chip specific setup/optimisation/messages here */ 70 /* Any chip specific setup/optimisation/messages here */
71 ata_pci_clear_simplex(pdev); 71 ata_pci_bmdma_clear_simplex(pdev);
72 72
73 /* And let the library code do the work */ 73 /* And let the library code do the work */
74 return ata_pci_init_one(pdev, port_info, &netcell_sht, NULL); 74 return ata_pci_sff_init_one(pdev, port_info, &netcell_sht, NULL);
75} 75}
76 76
77static const struct pci_device_id netcell_pci_tbl[] = { 77static const struct pci_device_id netcell_pci_tbl[] = {
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 8213d081f313..c9c0ea67c71a 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -73,7 +73,7 @@ static void ninja32_dev_select(struct ata_port *ap, unsigned int device)
73 struct ata_device *adev = &ap->link.device[device]; 73 struct ata_device *adev = &ap->link.device[device];
74 if (ap->private_data != adev) { 74 if (ap->private_data != adev) {
75 iowrite8(0xd6, ap->ioaddr.bmdma_addr + 0x1f); 75 iowrite8(0xd6, ap->ioaddr.bmdma_addr + 0x1f);
76 ata_std_dev_select(ap, device); 76 ata_sff_dev_select(ap, device);
77 ninja32_set_piomode(ap, adev); 77 ninja32_set_piomode(ap, adev);
78 } 78 }
79} 79}
@@ -132,7 +132,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
132 ap->ioaddr.ctl_addr = base + 0x1E; 132 ap->ioaddr.ctl_addr = base + 0x1E;
133 ap->ioaddr.altstatus_addr = base + 0x1E; 133 ap->ioaddr.altstatus_addr = base + 0x1E;
134 ap->ioaddr.bmdma_addr = base; 134 ap->ioaddr.bmdma_addr = base;
135 ata_std_ports(&ap->ioaddr); 135 ata_sff_std_ports(&ap->ioaddr);
136 136
137 iowrite8(0x05, base + 0x01); /* Enable interrupt lines */ 137 iowrite8(0x05, base + 0x01); /* Enable interrupt lines */
138 iowrite8(0xBE, base + 0x02); /* Burst, ?? setup */ 138 iowrite8(0xBE, base + 0x02); /* Burst, ?? setup */
@@ -142,7 +142,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
142 iowrite8(0xa4, base + 0x1c); /* Unknown */ 142 iowrite8(0xa4, base + 0x1c); /* Unknown */
143 iowrite8(0x83, base + 0x1d); /* BMDMA control: WAIT0 */ 143 iowrite8(0x83, base + 0x1d); /* BMDMA control: WAIT0 */
144 /* FIXME: Should we disable them at remove ? */ 144 /* FIXME: Should we disable them at remove ? */
145 return ata_host_activate(host, dev->irq, ata_interrupt, 145 return ata_host_activate(host, dev->irq, ata_sff_interrupt,
146 IRQF_SHARED, &ninja32_sht); 146 IRQF_SHARED, &ninja32_sht);
147} 147}
148 148
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 4d2eefee7387..76d2455bc453 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -50,7 +50,7 @@ static int ns87410_pre_reset(struct ata_link *link, unsigned long deadline)
50 if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) 50 if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no]))
51 return -ENOENT; 51 return -ENOENT;
52 52
53 return ata_std_prereset(link, deadline); 53 return ata_sff_prereset(link, deadline);
54} 54}
55 55
56/** 56/**
@@ -105,7 +105,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev)
105} 105}
106 106
107/** 107/**
108 * ns87410_qc_issue_prot - command issue 108 * ns87410_qc_issue - command issue
109 * @qc: command pending 109 * @qc: command pending
110 * 110 *
111 * Called when the libata layer is about to issue a command. We wrap 111 * Called when the libata layer is about to issue a command. We wrap
@@ -113,7 +113,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev)
113 * necessary. 113 * necessary.
114 */ 114 */
115 115
116static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) 116static unsigned int ns87410_qc_issue(struct ata_queued_cmd *qc)
117{ 117{
118 struct ata_port *ap = qc->ap; 118 struct ata_port *ap = qc->ap;
119 struct ata_device *adev = qc->dev; 119 struct ata_device *adev = qc->dev;
@@ -126,7 +126,7 @@ static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc)
126 if (adev->pio_mode && adev != ap->private_data) 126 if (adev->pio_mode && adev != ap->private_data)
127 ns87410_set_piomode(ap, adev); 127 ns87410_set_piomode(ap, adev);
128 128
129 return ata_qc_issue_prot(qc); 129 return ata_sff_qc_issue(qc);
130} 130}
131 131
132static struct scsi_host_template ns87410_sht = { 132static struct scsi_host_template ns87410_sht = {
@@ -135,7 +135,7 @@ static struct scsi_host_template ns87410_sht = {
135 135
136static struct ata_port_operations ns87410_port_ops = { 136static struct ata_port_operations ns87410_port_ops = {
137 .inherits = &ata_sff_port_ops, 137 .inherits = &ata_sff_port_ops,
138 .qc_issue = ns87410_qc_issue_prot, 138 .qc_issue = ns87410_qc_issue,
139 .cable_detect = ata_cable_40wire, 139 .cable_detect = ata_cable_40wire,
140 .set_piomode = ns87410_set_piomode, 140 .set_piomode = ns87410_set_piomode,
141 .prereset = ns87410_pre_reset, 141 .prereset = ns87410_pre_reset,
@@ -149,7 +149,7 @@ static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id)
149 .port_ops = &ns87410_port_ops 149 .port_ops = &ns87410_port_ops
150 }; 150 };
151 const struct ata_port_info *ppi[] = { &info, NULL }; 151 const struct ata_port_info *ppi[] = { &info, NULL };
152 return ata_pci_init_one(dev, ppi, &ns87410_sht, NULL); 152 return ata_pci_sff_init_one(dev, ppi, &ns87410_sht, NULL);
153} 153}
154 154
155static const struct pci_device_id ns87410[] = { 155static const struct pci_device_id ns87410[] = {
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index cdd79d6fc0ee..03a52cefc010 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -172,14 +172,14 @@ static void ns87415_bmdma_stop(struct ata_queued_cmd *qc)
172} 172}
173 173
174/** 174/**
175 * ns87415_bmdma_irq_clear - Clear interrupt 175 * ns87415_irq_clear - Clear interrupt
176 * @ap: Channel to clear 176 * @ap: Channel to clear
177 * 177 *
178 * Erratum: Due to a chip bug regisers 02 and 0A bit 1 and 2 (the 178 * Erratum: Due to a chip bug regisers 02 and 0A bit 1 and 2 (the
179 * error bits) are reset by writing to register 00 or 08. 179 * error bits) are reset by writing to register 00 or 08.
180 */ 180 */
181 181
182static void ns87415_bmdma_irq_clear(struct ata_port *ap) 182static void ns87415_irq_clear(struct ata_port *ap)
183{ 183{
184 void __iomem *mmio = ap->ioaddr.bmdma_addr; 184 void __iomem *mmio = ap->ioaddr.bmdma_addr;
185 185
@@ -306,7 +306,7 @@ static struct ata_port_operations ns87415_pata_ops = {
306 .bmdma_setup = ns87415_bmdma_setup, 306 .bmdma_setup = ns87415_bmdma_setup,
307 .bmdma_start = ns87415_bmdma_start, 307 .bmdma_start = ns87415_bmdma_start,
308 .bmdma_stop = ns87415_bmdma_stop, 308 .bmdma_stop = ns87415_bmdma_stop,
309 .irq_clear = ns87415_bmdma_irq_clear, 309 .irq_clear = ns87415_irq_clear,
310 310
311 .cable_detect = ata_cable_40wire, 311 .cable_detect = ata_cable_40wire,
312 .set_piomode = ns87415_set_piomode, 312 .set_piomode = ns87415_set_piomode,
@@ -375,7 +375,7 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *e
375 pci_write_config_byte(pdev, 0x55, 0xEE); 375 pci_write_config_byte(pdev, 0x55, 0xEE);
376 /* Select PIO0 8bit clocking */ 376 /* Select PIO0 8bit clocking */
377 pci_write_config_byte(pdev, 0x54, 0xB7); 377 pci_write_config_byte(pdev, 0x54, 0xB7);
378 return ata_pci_init_one(pdev, ppi, &ns87415_sht, NULL); 378 return ata_pci_sff_init_one(pdev, ppi, &ns87415_sht, NULL);
379} 379}
380 380
381static const struct pci_device_id ns87415_pci_tbl[] = { 381static const struct pci_device_id ns87415_pci_tbl[] = {
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index c1da79a76439..e678af383d13 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -47,7 +47,7 @@ static int oldpiix_pre_reset(struct ata_link *link, unsigned long deadline)
47 if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no])) 47 if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
48 return -ENOENT; 48 return -ENOENT;
49 49
50 return ata_std_prereset(link, deadline); 50 return ata_sff_prereset(link, deadline);
51} 51}
52 52
53/** 53/**
@@ -181,7 +181,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
181} 181}
182 182
183/** 183/**
184 * oldpiix_qc_issue_prot - command issue 184 * oldpiix_qc_issue - command issue
185 * @qc: command pending 185 * @qc: command pending
186 * 186 *
187 * Called when the libata layer is about to issue a command. We wrap 187 * Called when the libata layer is about to issue a command. We wrap
@@ -191,7 +191,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
191 * be made PIO0. 191 * be made PIO0.
192 */ 192 */
193 193
194static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc) 194static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
195{ 195{
196 struct ata_port *ap = qc->ap; 196 struct ata_port *ap = qc->ap;
197 struct ata_device *adev = qc->dev; 197 struct ata_device *adev = qc->dev;
@@ -201,7 +201,7 @@ static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)
201 if (adev->dma_mode) 201 if (adev->dma_mode)
202 oldpiix_set_dmamode(ap, adev); 202 oldpiix_set_dmamode(ap, adev);
203 } 203 }
204 return ata_qc_issue_prot(qc); 204 return ata_sff_qc_issue(qc);
205} 205}
206 206
207 207
@@ -211,7 +211,7 @@ static struct scsi_host_template oldpiix_sht = {
211 211
212static struct ata_port_operations oldpiix_pata_ops = { 212static struct ata_port_operations oldpiix_pata_ops = {
213 .inherits = &ata_bmdma_port_ops, 213 .inherits = &ata_bmdma_port_ops,
214 .qc_issue = oldpiix_qc_issue_prot, 214 .qc_issue = oldpiix_qc_issue,
215 .cable_detect = ata_cable_40wire, 215 .cable_detect = ata_cable_40wire,
216 .set_piomode = oldpiix_set_piomode, 216 .set_piomode = oldpiix_set_piomode,
217 .set_dmamode = oldpiix_set_dmamode, 217 .set_dmamode = oldpiix_set_dmamode,
@@ -249,7 +249,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *e
249 dev_printk(KERN_DEBUG, &pdev->dev, 249 dev_printk(KERN_DEBUG, &pdev->dev,
250 "version " DRV_VERSION "\n"); 250 "version " DRV_VERSION "\n");
251 251
252 return ata_pci_init_one(pdev, ppi, &oldpiix_sht, NULL); 252 return ata_pci_sff_init_one(pdev, ppi, &oldpiix_sht, NULL);
253} 253}
254 254
255static const struct pci_device_id oldpiix_pci_tbl[] = { 255static const struct pci_device_id oldpiix_pci_tbl[] = {
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 4ddd03a67775..fb2cf661b0e8 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -64,7 +64,7 @@ static int opti_pre_reset(struct ata_link *link, unsigned long deadline)
64 if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no])) 64 if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no]))
65 return -ENOENT; 65 return -ENOENT;
66 66
67 return ata_std_prereset(link, deadline); 67 return ata_sff_prereset(link, deadline);
68} 68}
69 69
70/** 70/**
@@ -173,7 +173,7 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
173 if (!printed_version++) 173 if (!printed_version++)
174 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n"); 174 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
175 175
176 return ata_pci_init_one(dev, ppi, &opti_sht, NULL); 176 return ata_pci_sff_init_one(dev, ppi, &opti_sht, NULL);
177} 177}
178 178
179static const struct pci_device_id opti[] = { 179static const struct pci_device_id opti[] = {
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 36ac147de178..4cd744456313 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -64,7 +64,7 @@ static int optidma_pre_reset(struct ata_link *link, unsigned long deadline)
64 if (ap->port_no && !pci_test_config_bits(pdev, &optidma_enable_bits)) 64 if (ap->port_no && !pci_test_config_bits(pdev, &optidma_enable_bits))
65 return -ENOENT; 65 return -ENOENT;
66 66
67 return ata_std_prereset(link, deadline); 67 return ata_sff_prereset(link, deadline);
68} 68}
69 69
70/** 70/**
@@ -430,7 +430,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
430 if (optiplus_with_udma(dev)) 430 if (optiplus_with_udma(dev))
431 ppi[0] = &info_82c700_udma; 431 ppi[0] = &info_82c700_udma;
432 432
433 return ata_pci_init_one(dev, ppi, &optidma_sht, NULL); 433 return ata_pci_sff_init_one(dev, ppi, &optidma_sht, NULL);
434} 434}
435 435
436static const struct pci_device_id optidma[] = { 436static const struct pci_device_id optidma[] = {
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 57efbf05c95f..2e206c5f869a 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -133,7 +133,7 @@ static struct scsi_host_template pcmcia_sht = {
133 133
134static struct ata_port_operations pcmcia_port_ops = { 134static struct ata_port_operations pcmcia_port_ops = {
135 .inherits = &ata_sff_port_ops, 135 .inherits = &ata_sff_port_ops,
136 .data_xfer = ata_data_xfer_noirq, 136 .data_xfer = ata_sff_data_xfer_noirq,
137 .cable_detect = ata_cable_40wire, 137 .cable_detect = ata_cable_40wire,
138 .set_mode = pcmcia_set_mode, 138 .set_mode = pcmcia_set_mode,
139}; 139};
@@ -323,13 +323,13 @@ next_entry:
323 ap->ioaddr.cmd_addr = io_addr + 0x10 * p; 323 ap->ioaddr.cmd_addr = io_addr + 0x10 * p;
324 ap->ioaddr.altstatus_addr = ctl_addr + 0x10 * p; 324 ap->ioaddr.altstatus_addr = ctl_addr + 0x10 * p;
325 ap->ioaddr.ctl_addr = ctl_addr + 0x10 * p; 325 ap->ioaddr.ctl_addr = ctl_addr + 0x10 * p;
326 ata_std_ports(&ap->ioaddr); 326 ata_sff_std_ports(&ap->ioaddr);
327 327
328 ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io_base, ctl_base); 328 ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io_base, ctl_base);
329 } 329 }
330 330
331 /* activate */ 331 /* activate */
332 ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_interrupt, 332 ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_sff_interrupt,
333 IRQF_SHARED, &pcmcia_sht); 333 IRQF_SHARED, &pcmcia_sht);
334 if (ret) 334 if (ret)
335 goto failed; 335 goto failed;
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index d235c9f92d09..0e1c2c1134d3 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -248,7 +248,7 @@ static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline)
248 /* Check whether port enabled */ 248 /* Check whether port enabled */
249 if (!pdc2027x_port_enabled(link->ap)) 249 if (!pdc2027x_port_enabled(link->ap))
250 return -ENOENT; 250 return -ENOENT;
251 return ata_std_prereset(link, deadline); 251 return ata_sff_prereset(link, deadline);
252} 252}
253 253
254/** 254/**
@@ -265,7 +265,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
265 struct ata_device *pair = ata_dev_pair(adev); 265 struct ata_device *pair = ata_dev_pair(adev);
266 266
267 if (adev->class != ATA_DEV_ATA || adev->devno == 0 || pair == NULL) 267 if (adev->class != ATA_DEV_ATA || adev->devno == 0 || pair == NULL)
268 return ata_pci_default_filter(adev, mask); 268 return ata_bmdma_mode_filter(adev, mask);
269 269
270 /* Check for slave of a Maxtor at UDMA6 */ 270 /* Check for slave of a Maxtor at UDMA6 */
271 ata_id_c_string(pair->id, model_num, ATA_ID_PROD, 271 ata_id_c_string(pair->id, model_num, ATA_ID_PROD,
@@ -274,7 +274,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
274 if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6) 274 if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6)
275 mask &= ~ (1 << (6 + ATA_SHIFT_UDMA)); 275 mask &= ~ (1 << (6 + ATA_SHIFT_UDMA));
276 276
277 return ata_pci_default_filter(adev, mask); 277 return ata_bmdma_mode_filter(adev, mask);
278} 278}
279 279
280/** 280/**
@@ -759,8 +759,8 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_de
759 return -EIO; 759 return -EIO;
760 760
761 pci_set_master(pdev); 761 pci_set_master(pdev);
762 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 762 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
763 &pdc2027x_sht); 763 IRQF_SHARED, &pdc2027x_sht);
764} 764}
765 765
766/** 766/**
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 8214100e3ac1..d2673060bc8d 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -324,7 +324,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id
324 return -ENODEV; 324 return -ENODEV;
325 } 325 }
326 } 326 }
327 return ata_pci_init_one(dev, ppi, &pdc202xx_sht, NULL); 327 return ata_pci_sff_init_one(dev, ppi, &pdc202xx_sht, NULL);
328} 328}
329 329
330static const struct pci_device_id pdc202xx[] = { 330static const struct pci_device_id pdc202xx[] = {
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 0588c9b7e73e..1edfc13d05d2 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -52,7 +52,7 @@ static struct scsi_host_template pata_platform_sht = {
52 52
53static struct ata_port_operations pata_platform_port_ops = { 53static struct ata_port_operations pata_platform_port_ops = {
54 .inherits = &ata_sff_port_ops, 54 .inherits = &ata_sff_port_ops,
55 .data_xfer = ata_data_xfer_noirq, 55 .data_xfer = ata_sff_data_xfer_noirq,
56 .cable_detect = ata_cable_unknown, 56 .cable_detect = ata_cable_unknown,
57 .set_mode = pata_platform_set_mode, 57 .set_mode = pata_platform_set_mode,
58 .port_start = ATA_OP_NULL, 58 .port_start = ATA_OP_NULL,
@@ -176,7 +176,7 @@ int __devinit __pata_platform_probe(struct device *dev,
176 (unsigned long long)ctl_res->start); 176 (unsigned long long)ctl_res->start);
177 177
178 /* activate */ 178 /* activate */
179 return ata_host_activate(host, irq, irq ? ata_interrupt : NULL, 179 return ata_host_activate(host, irq, irq ? ata_sff_interrupt : NULL,
180 irq_flags, &pata_platform_sht); 180 irq_flags, &pata_platform_sht);
181} 181}
182EXPORT_SYMBOL_GPL(__pata_platform_probe); 182EXPORT_SYMBOL_GPL(__pata_platform_probe);
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index d16b343d2a62..0d81dd5fdc38 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -102,14 +102,14 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
102} 102}
103 103
104/** 104/**
105 * qdi_qc_issue_prot - command issue 105 * qdi_qc_issue - command issue
106 * @qc: command pending 106 * @qc: command pending
107 * 107 *
108 * Called when the libata layer is about to issue a command. We wrap 108 * Called when the libata layer is about to issue a command. We wrap
109 * this interface so that we can load the correct ATA timings. 109 * this interface so that we can load the correct ATA timings.
110 */ 110 */
111 111
112static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc) 112static unsigned int qdi_qc_issue(struct ata_queued_cmd *qc)
113{ 113{
114 struct ata_port *ap = qc->ap; 114 struct ata_port *ap = qc->ap;
115 struct ata_device *adev = qc->dev; 115 struct ata_device *adev = qc->dev;
@@ -121,7 +121,7 @@ static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
121 outb(qdi->clock[adev->devno], qdi->timing); 121 outb(qdi->clock[adev->devno], qdi->timing);
122 } 122 }
123 } 123 }
124 return ata_qc_issue_prot(qc); 124 return ata_sff_qc_issue(qc);
125} 125}
126 126
127static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf, 127static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
@@ -148,7 +148,7 @@ static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf,
148 buflen += 4 - slop; 148 buflen += 4 - slop;
149 } 149 }
150 } else 150 } else
151 buflen = ata_data_xfer(dev, buf, buflen, rw); 151 buflen = ata_sff_data_xfer(dev, buf, buflen, rw);
152 152
153 return buflen; 153 return buflen;
154} 154}
@@ -159,7 +159,7 @@ static struct scsi_host_template qdi_sht = {
159 159
160static struct ata_port_operations qdi6500_port_ops = { 160static struct ata_port_operations qdi6500_port_ops = {
161 .inherits = &ata_sff_port_ops, 161 .inherits = &ata_sff_port_ops,
162 .qc_issue = qdi_qc_issue_prot, 162 .qc_issue = qdi_qc_issue,
163 .data_xfer = qdi_data_xfer, 163 .data_xfer = qdi_data_xfer,
164 .cable_detect = ata_cable_40wire, 164 .cable_detect = ata_cable_40wire,
165 .set_piomode = qdi6500_set_piomode, 165 .set_piomode = qdi6500_set_piomode,
@@ -223,7 +223,7 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
223 ap->ioaddr.cmd_addr = io_addr; 223 ap->ioaddr.cmd_addr = io_addr;
224 ap->ioaddr.altstatus_addr = ctl_addr; 224 ap->ioaddr.altstatus_addr = ctl_addr;
225 ap->ioaddr.ctl_addr = ctl_addr; 225 ap->ioaddr.ctl_addr = ctl_addr;
226 ata_std_ports(&ap->ioaddr); 226 ata_sff_std_ports(&ap->ioaddr);
227 227
228 ata_port_desc(ap, "cmd %lx ctl %lx", io, ctl); 228 ata_port_desc(ap, "cmd %lx ctl %lx", io, ctl);
229 229
@@ -239,7 +239,7 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
239 printk(KERN_INFO DRV_NAME": qd%d at 0x%lx.\n", type, io); 239 printk(KERN_INFO DRV_NAME": qd%d at 0x%lx.\n", type, io);
240 240
241 /* activate */ 241 /* activate */
242 ret = ata_host_activate(host, irq, ata_interrupt, 0, &qdi_sht); 242 ret = ata_host_activate(host, irq, ata_sff_interrupt, 0, &qdi_sht);
243 if (ret) 243 if (ret)
244 goto fail; 244 goto fail;
245 245
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 9ab84fc3798d..1c0d9fa7ee54 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -156,7 +156,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
156} 156}
157 157
158/** 158/**
159 * radisys_qc_issue_prot - command issue 159 * radisys_qc_issue - command issue
160 * @qc: command pending 160 * @qc: command pending
161 * 161 *
162 * Called when the libata layer is about to issue a command. We wrap 162 * Called when the libata layer is about to issue a command. We wrap
@@ -166,7 +166,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
166 * be made PIO0. 166 * be made PIO0.
167 */ 167 */
168 168
169static unsigned int radisys_qc_issue_prot(struct ata_queued_cmd *qc) 169static unsigned int radisys_qc_issue(struct ata_queued_cmd *qc)
170{ 170{
171 struct ata_port *ap = qc->ap; 171 struct ata_port *ap = qc->ap;
172 struct ata_device *adev = qc->dev; 172 struct ata_device *adev = qc->dev;
@@ -180,7 +180,7 @@ static unsigned int radisys_qc_issue_prot(struct ata_queued_cmd *qc)
180 radisys_set_piomode(ap, adev); 180 radisys_set_piomode(ap, adev);
181 } 181 }
182 } 182 }
183 return ata_qc_issue_prot(qc); 183 return ata_sff_qc_issue(qc);
184} 184}
185 185
186 186
@@ -190,7 +190,7 @@ static struct scsi_host_template radisys_sht = {
190 190
191static struct ata_port_operations radisys_pata_ops = { 191static struct ata_port_operations radisys_pata_ops = {
192 .inherits = &ata_bmdma_port_ops, 192 .inherits = &ata_bmdma_port_ops,
193 .qc_issue = radisys_qc_issue_prot, 193 .qc_issue = radisys_qc_issue,
194 .cable_detect = ata_cable_unknown, 194 .cable_detect = ata_cable_unknown,
195 .set_piomode = radisys_set_piomode, 195 .set_piomode = radisys_set_piomode,
196 .set_dmamode = radisys_set_dmamode, 196 .set_dmamode = radisys_set_dmamode,
@@ -228,7 +228,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e
228 dev_printk(KERN_DEBUG, &pdev->dev, 228 dev_printk(KERN_DEBUG, &pdev->dev,
229 "version " DRV_VERSION "\n"); 229 "version " DRV_VERSION "\n");
230 230
231 return ata_pci_init_one(pdev, ppi, &radisys_sht, NULL); 231 return ata_pci_sff_init_one(pdev, ppi, &radisys_sht, NULL);
232} 232}
233 233
234static const struct pci_device_id radisys_pci_tbl[] = { 234static const struct pci_device_id radisys_pci_tbl[] = {
diff --git a/drivers/ata/pata_rb500_cf.c b/drivers/ata/pata_rb500_cf.c
index 7affceec1c29..5b23d79bc92b 100644
--- a/drivers/ata/pata_rb500_cf.c
+++ b/drivers/ata/pata_rb500_cf.c
@@ -57,7 +57,7 @@ static inline void rb500_pata_finish_io(struct ata_port *ap)
57 struct ata_host *ah = ap->host; 57 struct ata_host *ah = ap->host;
58 struct rb500_cf_info *info = ah->private_data; 58 struct rb500_cf_info *info = ah->private_data;
59 59
60 ata_altstatus(ap); 60 ata_sff_altstatus(ap);
61 ndelay(RB500_CF_IO_DELAY); 61 ndelay(RB500_CF_IO_DELAY);
62 62
63 set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); 63 set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
@@ -109,7 +109,7 @@ static irqreturn_t rb500_pata_irq_handler(int irq, void *dev_instance)
109 if (gpio_get_value(info->gpio_line)) { 109 if (gpio_get_value(info->gpio_line)) {
110 set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW); 110 set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
111 if (!info->frozen) 111 if (!info->frozen)
112 ata_interrupt(info->irq, dev_instance); 112 ata_sff_interrupt(info->irq, dev_instance);
113 } else { 113 } else {
114 set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); 114 set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
115 } 115 }
@@ -148,7 +148,7 @@ static void rb500_pata_setup_ports(struct ata_host *ah)
148 ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; 148 ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL;
149 ap->ioaddr.altstatus_addr = info->iobase + RB500_CF_REG_CTRL; 149 ap->ioaddr.altstatus_addr = info->iobase + RB500_CF_REG_CTRL;
150 150
151 ata_std_ports(&ap->ioaddr); 151 ata_sff_std_ports(&ap->ioaddr);
152 152
153 ap->ioaddr.data_addr = info->iobase + RB500_CF_REG_DATA; 153 ap->ioaddr.data_addr = info->iobase + RB500_CF_REG_DATA;
154} 154}
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 462b72a31280..7dfd1f3f6f3a 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -99,7 +99,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en
99 printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); 99 printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
100 100
101 if (rz1000_fifo_disable(pdev) == 0) 101 if (rz1000_fifo_disable(pdev) == 0)
102 return ata_pci_init_one(pdev, ppi, &rz1000_sht, NULL); 102 return ata_pci_sff_init_one(pdev, ppi, &rz1000_sht, NULL);
103 103
104 printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n"); 104 printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n");
105 /* Not safe to use so skip */ 105 /* Not safe to use so skip */
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 42efacf73c79..cbab397e3db7 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -151,7 +151,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
151} 151}
152 152
153/** 153/**
154 * sc1200_qc_issue_prot - command issue 154 * sc1200_qc_issue - command issue
155 * @qc: command pending 155 * @qc: command pending
156 * 156 *
157 * Called when the libata layer is about to issue a command. We wrap 157 * Called when the libata layer is about to issue a command. We wrap
@@ -160,7 +160,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
160 * one MWDMA/UDMA bit. 160 * one MWDMA/UDMA bit.
161 */ 161 */
162 162
163static unsigned int sc1200_qc_issue_prot(struct ata_queued_cmd *qc) 163static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)
164{ 164{
165 struct ata_port *ap = qc->ap; 165 struct ata_port *ap = qc->ap;
166 struct ata_device *adev = qc->dev; 166 struct ata_device *adev = qc->dev;
@@ -175,7 +175,7 @@ static unsigned int sc1200_qc_issue_prot(struct ata_queued_cmd *qc)
175 sc1200_set_dmamode(ap, adev); 175 sc1200_set_dmamode(ap, adev);
176 } 176 }
177 177
178 return ata_qc_issue_prot(qc); 178 return ata_sff_qc_issue(qc);
179} 179}
180 180
181static struct scsi_host_template sc1200_sht = { 181static struct scsi_host_template sc1200_sht = {
@@ -185,8 +185,8 @@ static struct scsi_host_template sc1200_sht = {
185 185
186static struct ata_port_operations sc1200_port_ops = { 186static struct ata_port_operations sc1200_port_ops = {
187 .inherits = &ata_bmdma_port_ops, 187 .inherits = &ata_bmdma_port_ops,
188 .qc_prep = ata_dumb_qc_prep, 188 .qc_prep = ata_sff_dumb_qc_prep,
189 .qc_issue = sc1200_qc_issue_prot, 189 .qc_issue = sc1200_qc_issue,
190 .cable_detect = ata_cable_40wire, 190 .cable_detect = ata_cable_40wire,
191 .set_piomode = sc1200_set_piomode, 191 .set_piomode = sc1200_set_piomode,
192 .set_dmamode = sc1200_set_dmamode, 192 .set_dmamode = sc1200_set_dmamode,
@@ -213,7 +213,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
213 /* Can't enable port 2 yet, see top comments */ 213 /* Can't enable port 2 yet, see top comments */
214 const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; 214 const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
215 215
216 return ata_pci_init_one(dev, ppi, &sc1200_sht, NULL); 216 return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL);
217} 217}
218 218
219static const struct pci_device_id sc1200[] = { 219static const struct pci_device_id sc1200[] = {
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index fba5bed0a641..701d0addae73 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -266,7 +266,7 @@ unsigned long scc_mode_filter(struct ata_device *adev, unsigned long mask)
266 printk(KERN_INFO "%s: limit ATAPI UDMA to UDMA4\n", DRV_NAME); 266 printk(KERN_INFO "%s: limit ATAPI UDMA to UDMA4\n", DRV_NAME);
267 mask &= ~(0xE0 << ATA_SHIFT_UDMA); 267 mask &= ~(0xE0 << ATA_SHIFT_UDMA);
268 } 268 }
269 return ata_pci_default_filter(adev, mask); 269 return ata_bmdma_mode_filter(adev, mask);
270} 270}
271 271
272/** 272/**
@@ -274,7 +274,7 @@ unsigned long scc_mode_filter(struct ata_device *adev, unsigned long mask)
274 * @ap: Port to which output is sent 274 * @ap: Port to which output is sent
275 * @tf: ATA taskfile register set 275 * @tf: ATA taskfile register set
276 * 276 *
277 * Note: Original code is ata_tf_load(). 277 * Note: Original code is ata_sff_tf_load().
278 */ 278 */
279 279
280static void scc_tf_load (struct ata_port *ap, const struct ata_taskfile *tf) 280static void scc_tf_load (struct ata_port *ap, const struct ata_taskfile *tf)
@@ -341,7 +341,7 @@ static u8 scc_check_status (struct ata_port *ap)
341 * @ap: Port from which input is read 341 * @ap: Port from which input is read
342 * @tf: ATA taskfile register set for storing input 342 * @tf: ATA taskfile register set for storing input
343 * 343 *
344 * Note: Original code is ata_tf_read(). 344 * Note: Original code is ata_sff_tf_read().
345 */ 345 */
346 346
347static void scc_tf_read (struct ata_port *ap, struct ata_taskfile *tf) 347static void scc_tf_read (struct ata_port *ap, struct ata_taskfile *tf)
@@ -373,7 +373,7 @@ static void scc_tf_read (struct ata_port *ap, struct ata_taskfile *tf)
373 * @ap: port to which command is being issued 373 * @ap: port to which command is being issued
374 * @tf: ATA taskfile register set 374 * @tf: ATA taskfile register set
375 * 375 *
376 * Note: Original code is ata_exec_command(). 376 * Note: Original code is ata_sff_exec_command().
377 */ 377 */
378 378
379static void scc_exec_command (struct ata_port *ap, 379static void scc_exec_command (struct ata_port *ap,
@@ -382,7 +382,7 @@ static void scc_exec_command (struct ata_port *ap,
382 DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command); 382 DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
383 383
384 out_be32(ap->ioaddr.command_addr, tf->command); 384 out_be32(ap->ioaddr.command_addr, tf->command);
385 ata_pause(ap); 385 ata_sff_pause(ap);
386} 386}
387 387
388/** 388/**
@@ -396,14 +396,14 @@ static u8 scc_check_altstatus (struct ata_port *ap)
396} 396}
397 397
398/** 398/**
399 * scc_std_dev_select - Select device 0/1 on ATA bus 399 * scc_dev_select - Select device 0/1 on ATA bus
400 * @ap: ATA channel to manipulate 400 * @ap: ATA channel to manipulate
401 * @device: ATA device (numbered from zero) to select 401 * @device: ATA device (numbered from zero) to select
402 * 402 *
403 * Note: Original code is ata_std_dev_select(). 403 * Note: Original code is ata_sff_dev_select().
404 */ 404 */
405 405
406static void scc_std_dev_select (struct ata_port *ap, unsigned int device) 406static void scc_dev_select (struct ata_port *ap, unsigned int device)
407{ 407{
408 u8 tmp; 408 u8 tmp;
409 409
@@ -413,7 +413,7 @@ static void scc_std_dev_select (struct ata_port *ap, unsigned int device)
413 tmp = ATA_DEVICE_OBS | ATA_DEV1; 413 tmp = ATA_DEVICE_OBS | ATA_DEV1;
414 414
415 out_be32(ap->ioaddr.device_addr, tmp); 415 out_be32(ap->ioaddr.device_addr, tmp);
416 ata_pause(ap); 416 ata_sff_pause(ap);
417} 417}
418 418
419/** 419/**
@@ -514,7 +514,7 @@ static int scc_bus_post_reset(struct ata_port *ap, unsigned int devmask,
514 * BSY bit to clear 514 * BSY bit to clear
515 */ 515 */
516 if (dev0) { 516 if (dev0) {
517 rc = ata_wait_ready(ap, deadline); 517 rc = ata_sff_wait_ready(ap, deadline);
518 if (rc && rc != -ENODEV) 518 if (rc && rc != -ENODEV)
519 return rc; 519 return rc;
520 } 520 }
@@ -535,7 +535,7 @@ static int scc_bus_post_reset(struct ata_port *ap, unsigned int devmask,
535 msleep(50); /* give drive a breather */ 535 msleep(50); /* give drive a breather */
536 } 536 }
537 if (dev1) { 537 if (dev1) {
538 rc = ata_wait_ready(ap, deadline); 538 rc = ata_sff_wait_ready(ap, deadline);
539 if (rc && rc != -ENODEV) 539 if (rc && rc != -ENODEV)
540 return rc; 540 return rc;
541 } 541 }
@@ -571,7 +571,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,
571 out_be32(ioaddr->ctl_addr, ap->ctl); 571 out_be32(ioaddr->ctl_addr, ap->ctl);
572 572
573 /* wait a while before checking status */ 573 /* wait a while before checking status */
574 ata_wait_after_reset(ap, deadline); 574 ata_sff_wait_after_reset(ap, deadline);
575 575
576 /* Before we perform post reset processing we want to see if 576 /* Before we perform post reset processing we want to see if
577 * the bus shows 0xFF because the odd clown forgets the D7 577 * the bus shows 0xFF because the odd clown forgets the D7
@@ -586,16 +586,16 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,
586} 586}
587 587
588/** 588/**
589 * scc_std_softreset - reset host port via ATA SRST 589 * scc_softreset - reset host port via ATA SRST
590 * @ap: port to reset 590 * @ap: port to reset
591 * @classes: resulting classes of attached devices 591 * @classes: resulting classes of attached devices
592 * @deadline: deadline jiffies for the operation 592 * @deadline: deadline jiffies for the operation
593 * 593 *
594 * Note: Original code is ata_std_softreset(). 594 * Note: Original code is ata_sff_softreset().
595 */ 595 */
596 596
597static int scc_std_softreset(struct ata_link *link, unsigned int *classes, 597static int scc_softreset(struct ata_link *link, unsigned int *classes,
598 unsigned long deadline) 598 unsigned long deadline)
599{ 599{
600 struct ata_port *ap = link->ap; 600 struct ata_port *ap = link->ap;
601 unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS; 601 unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
@@ -628,10 +628,10 @@ static int scc_std_softreset(struct ata_link *link, unsigned int *classes,
628 } 628 }
629 629
630 /* determine by signature whether we have ATA or ATAPI devices */ 630 /* determine by signature whether we have ATA or ATAPI devices */
631 classes[0] = ata_dev_try_classify(&ap->link.device[0], 631 classes[0] = ata_sff_dev_classify(&ap->link.device[0],
632 devmask & (1 << 0), &err); 632 devmask & (1 << 0), &err);
633 if (slave_possible && err != 0x81) 633 if (slave_possible && err != 0x81)
634 classes[1] = ata_dev_try_classify(&ap->link.device[1], 634 classes[1] = ata_sff_dev_classify(&ap->link.device[1],
635 devmask & (1 << 1), &err); 635 devmask & (1 << 1), &err);
636 636
637 out: 637 out:
@@ -695,7 +695,7 @@ static void scc_bmdma_stop (struct ata_queued_cmd *qc)
695 printk(KERN_WARNING "%s: Internal Bus Error\n", DRV_NAME); 695 printk(KERN_WARNING "%s: Internal Bus Error\n", DRV_NAME);
696 out_be32(bmid_base + SCC_DMA_INTST, INTSTS_BMSINT); 696 out_be32(bmid_base + SCC_DMA_INTST, INTSTS_BMSINT);
697 /* TBD: SW reset */ 697 /* TBD: SW reset */
698 scc_std_softreset(&ap->link, &classes, deadline); 698 scc_softreset(&ap->link, &classes, deadline);
699 continue; 699 continue;
700 } 700 }
701 701
@@ -721,7 +721,7 @@ static void scc_bmdma_stop (struct ata_queued_cmd *qc)
721 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START); 721 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
722 722
723 /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */ 723 /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */
724 ata_altstatus(ap); /* dummy read */ 724 ata_sff_altstatus(ap); /* dummy read */
725} 725}
726 726
727/** 727/**
@@ -742,7 +742,7 @@ static u8 scc_bmdma_status (struct ata_port *ap)
742 return host_stat; 742 return host_stat;
743 743
744 /* errata A252,A308 workaround: Step4 */ 744 /* errata A252,A308 workaround: Step4 */
745 if ((ata_altstatus(ap) & ATA_ERR) && (int_status & INTSTS_INTRQ)) 745 if ((ata_sff_altstatus(ap) & ATA_ERR) && (int_status & INTSTS_INTRQ))
746 return (host_stat | ATA_DMA_INTR); 746 return (host_stat | ATA_DMA_INTR);
747 747
748 /* errata A308 workaround Step5 */ 748 /* errata A308 workaround Step5 */
@@ -773,7 +773,7 @@ static u8 scc_bmdma_status (struct ata_port *ap)
773 * @buflen: buffer length 773 * @buflen: buffer length
774 * @rw: read/write 774 * @rw: read/write
775 * 775 *
776 * Note: Original code is ata_data_xfer(). 776 * Note: Original code is ata_sff_data_xfer().
777 */ 777 */
778 778
779static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf, 779static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
@@ -815,7 +815,7 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
815 * scc_irq_on - Enable interrupts on a port. 815 * scc_irq_on - Enable interrupts on a port.
816 * @ap: Port on which interrupts are enabled. 816 * @ap: Port on which interrupts are enabled.
817 * 817 *
818 * Note: Original code is ata_irq_on(). 818 * Note: Original code is ata_sff_irq_on().
819 */ 819 */
820 820
821static u8 scc_irq_on (struct ata_port *ap) 821static u8 scc_irq_on (struct ata_port *ap)
@@ -835,13 +835,13 @@ static u8 scc_irq_on (struct ata_port *ap)
835} 835}
836 836
837/** 837/**
838 * scc_bmdma_freeze - Freeze BMDMA controller port 838 * scc_freeze - Freeze BMDMA controller port
839 * @ap: port to freeze 839 * @ap: port to freeze
840 * 840 *
841 * Note: Original code is ata_bmdma_freeze(). 841 * Note: Original code is ata_sff_freeze().
842 */ 842 */
843 843
844static void scc_bmdma_freeze (struct ata_port *ap) 844static void scc_freeze (struct ata_port *ap)
845{ 845{
846 struct ata_ioports *ioaddr = &ap->ioaddr; 846 struct ata_ioports *ioaddr = &ap->ioaddr;
847 847
@@ -868,18 +868,18 @@ static void scc_bmdma_freeze (struct ata_port *ap)
868static int scc_pata_prereset(struct ata_link *link, unsigned long deadline) 868static int scc_pata_prereset(struct ata_link *link, unsigned long deadline)
869{ 869{
870 link->ap->cbl = ATA_CBL_PATA80; 870 link->ap->cbl = ATA_CBL_PATA80;
871 return ata_std_prereset(link, deadline); 871 return ata_sff_prereset(link, deadline);
872} 872}
873 873
874/** 874/**
875 * scc_std_postreset - standard postreset callback 875 * scc_postreset - standard postreset callback
876 * @ap: the target ata_port 876 * @ap: the target ata_port
877 * @classes: classes of attached devices 877 * @classes: classes of attached devices
878 * 878 *
879 * Note: Original code is ata_std_postreset(). 879 * Note: Original code is ata_sff_postreset().
880 */ 880 */
881 881
882static void scc_std_postreset(struct ata_link *link, unsigned int *classes) 882static void scc_postreset(struct ata_link *link, unsigned int *classes)
883{ 883{
884 struct ata_port *ap = link->ap; 884 struct ata_port *ap = link->ap;
885 885
@@ -905,13 +905,13 @@ static void scc_std_postreset(struct ata_link *link, unsigned int *classes)
905} 905}
906 906
907/** 907/**
908 * scc_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt. 908 * scc_irq_clear - Clear PCI IDE BMDMA interrupt.
909 * @ap: Port associated with this ATA transaction. 909 * @ap: Port associated with this ATA transaction.
910 * 910 *
911 * Note: Original code is ata_bmdma_irq_clear(). 911 * Note: Original code is ata_sff_irq_clear().
912 */ 912 */
913 913
914static void scc_bmdma_irq_clear (struct ata_port *ap) 914static void scc_irq_clear (struct ata_port *ap)
915{ 915{
916 void __iomem *mmio = ap->ioaddr.bmdma_addr; 916 void __iomem *mmio = ap->ioaddr.bmdma_addr;
917 917
@@ -972,7 +972,7 @@ static struct ata_port_operations scc_pata_ops = {
972 .exec_command = scc_exec_command, 972 .exec_command = scc_exec_command,
973 .check_status = scc_check_status, 973 .check_status = scc_check_status,
974 .check_altstatus = scc_check_altstatus, 974 .check_altstatus = scc_check_altstatus,
975 .dev_select = scc_std_dev_select, 975 .dev_select = scc_dev_select,
976 976
977 .bmdma_setup = scc_bmdma_setup, 977 .bmdma_setup = scc_bmdma_setup,
978 .bmdma_start = scc_bmdma_start, 978 .bmdma_start = scc_bmdma_start,
@@ -980,13 +980,13 @@ static struct ata_port_operations scc_pata_ops = {
980 .bmdma_status = scc_bmdma_status, 980 .bmdma_status = scc_bmdma_status,
981 .data_xfer = scc_data_xfer, 981 .data_xfer = scc_data_xfer,
982 982
983 .freeze = scc_bmdma_freeze, 983 .freeze = scc_freeze,
984 .prereset = scc_pata_prereset, 984 .prereset = scc_pata_prereset,
985 .softreset = scc_std_softreset, 985 .softreset = scc_softreset,
986 .postreset = scc_std_postreset, 986 .postreset = scc_postreset,
987 .post_internal_cmd = scc_bmdma_stop, 987 .post_internal_cmd = scc_bmdma_stop,
988 988
989 .irq_clear = scc_bmdma_irq_clear, 989 .irq_clear = scc_irq_clear,
990 .irq_on = scc_irq_on, 990 .irq_on = scc_irq_on,
991 991
992 .port_start = scc_port_start, 992 .port_start = scc_port_start,
@@ -1140,8 +1140,8 @@ static int scc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1140 if (rc) 1140 if (rc)
1141 return rc; 1141 return rc;
1142 1142
1143 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 1143 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
1144 &scc_sht); 1144 IRQF_SHARED, &scc_sht);
1145} 1145}
1146 1146
1147static struct pci_driver scc_pci_driver = { 1147static struct pci_driver scc_pci_driver = {
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 2f4f9b0f89de..ffd26d0dc50d 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -199,7 +199,7 @@ static unsigned long serverworks_osb4_filter(struct ata_device *adev, unsigned l
199{ 199{
200 if (adev->class == ATA_DEV_ATA) 200 if (adev->class == ATA_DEV_ATA)
201 mask &= ~ATA_MASK_UDMA; 201 mask &= ~ATA_MASK_UDMA;
202 return ata_pci_default_filter(adev, mask); 202 return ata_bmdma_mode_filter(adev, mask);
203} 203}
204 204
205 205
@@ -219,7 +219,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
219 219
220 /* Disk, UDMA */ 220 /* Disk, UDMA */
221 if (adev->class != ATA_DEV_ATA) 221 if (adev->class != ATA_DEV_ATA)
222 return ata_pci_default_filter(adev, mask); 222 return ata_bmdma_mode_filter(adev, mask);
223 223
224 /* Actually do need to check */ 224 /* Actually do need to check */
225 ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num)); 225 ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
@@ -228,7 +228,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
228 if (!strcmp(p, model_num)) 228 if (!strcmp(p, model_num))
229 mask &= ~(0xE0 << ATA_SHIFT_UDMA); 229 mask &= ~(0xE0 << ATA_SHIFT_UDMA);
230 } 230 }
231 return ata_pci_default_filter(adev, mask); 231 return ata_bmdma_mode_filter(adev, mask);
232} 232}
233 233
234/** 234/**
@@ -459,9 +459,9 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
459 serverworks_fixup_ht1000(pdev); 459 serverworks_fixup_ht1000(pdev);
460 460
461 if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE) 461 if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
462 ata_pci_clear_simplex(pdev); 462 ata_pci_bmdma_clear_simplex(pdev);
463 463
464 return ata_pci_init_one(pdev, ppi, &serverworks_sht, NULL); 464 return ata_pci_sff_init_one(pdev, ppi, &serverworks_sht, NULL);
465} 465}
466 466
467#ifdef CONFIG_PM 467#ifdef CONFIG_PM
@@ -482,7 +482,7 @@ static int serverworks_reinit_one(struct pci_dev *pdev)
482 serverworks_fixup_osb4(pdev); 482 serverworks_fixup_osb4(pdev);
483 break; 483 break;
484 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE: 484 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
485 ata_pci_clear_simplex(pdev); 485 ata_pci_bmdma_clear_simplex(pdev);
486 /* fall through */ 486 /* fall through */
487 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE: 487 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
488 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2: 488 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2:
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 63fafc6d6da3..720b8645f58a 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -350,19 +350,19 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
350 host->ports[0]->ioaddr.cmd_addr = mmio_base + 0x80; 350 host->ports[0]->ioaddr.cmd_addr = mmio_base + 0x80;
351 host->ports[0]->ioaddr.ctl_addr = mmio_base + 0x8a; 351 host->ports[0]->ioaddr.ctl_addr = mmio_base + 0x8a;
352 host->ports[0]->ioaddr.altstatus_addr = mmio_base + 0x8a; 352 host->ports[0]->ioaddr.altstatus_addr = mmio_base + 0x8a;
353 ata_std_ports(&host->ports[0]->ioaddr); 353 ata_sff_std_ports(&host->ports[0]->ioaddr);
354 host->ports[1]->ioaddr.bmdma_addr = mmio_base + 0x08; 354 host->ports[1]->ioaddr.bmdma_addr = mmio_base + 0x08;
355 host->ports[1]->ioaddr.cmd_addr = mmio_base + 0xc0; 355 host->ports[1]->ioaddr.cmd_addr = mmio_base + 0xc0;
356 host->ports[1]->ioaddr.ctl_addr = mmio_base + 0xca; 356 host->ports[1]->ioaddr.ctl_addr = mmio_base + 0xca;
357 host->ports[1]->ioaddr.altstatus_addr = mmio_base + 0xca; 357 host->ports[1]->ioaddr.altstatus_addr = mmio_base + 0xca;
358 ata_std_ports(&host->ports[1]->ioaddr); 358 ata_sff_std_ports(&host->ports[1]->ioaddr);
359 359
360 /* Register & activate */ 360 /* Register & activate */
361 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 361 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
362 &sil680_sht); 362 IRQF_SHARED, &sil680_sht);
363 363
364use_ioports: 364use_ioports:
365 return ata_pci_init_one(pdev, ppi, &sil680_sht, NULL); 365 return ata_pci_sff_init_one(pdev, ppi, &sil680_sht, NULL);
366} 366}
367 367
368#ifdef CONFIG_PM 368#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 793e6714df8c..e82c66e8d31b 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -156,7 +156,7 @@ static int sis_pre_reset(struct ata_link *link, unsigned long deadline)
156 /* Clear the FIFO settings. We can't enable the FIFO until 156 /* Clear the FIFO settings. We can't enable the FIFO until
157 we know we are poking at a disk */ 157 we know we are poking at a disk */
158 pci_write_config_byte(pdev, 0x4B, 0); 158 pci_write_config_byte(pdev, 0x4B, 0);
159 return ata_std_prereset(link, deadline); 159 return ata_sff_prereset(link, deadline);
160} 160}
161 161
162 162
@@ -821,7 +821,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
821 821
822 sis_fixup(pdev, chipset); 822 sis_fixup(pdev, chipset);
823 823
824 return ata_pci_init_one(pdev, ppi, &sis_sht, chipset); 824 return ata_pci_sff_init_one(pdev, ppi, &sis_sht, chipset);
825} 825}
826 826
827static const struct pci_device_id sis_pci_tbl[] = { 827static const struct pci_device_id sis_pci_tbl[] = {
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index bee11ca8f55a..70d94fb28a5f 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -60,7 +60,7 @@ static int sl82c105_pre_reset(struct ata_link *link, unsigned long deadline)
60 60
61 if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) 61 if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no]))
62 return -ENOENT; 62 return -ENOENT;
63 return ata_std_prereset(link, deadline); 63 return ata_sff_prereset(link, deadline);
64} 64}
65 65
66 66
@@ -317,7 +317,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id
317 val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16; 317 val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16;
318 pci_write_config_dword(dev, 0x40, val); 318 pci_write_config_dword(dev, 0x40, val);
319 319
320 return ata_pci_init_one(dev, ppi, &sl82c105_sht, NULL); 320 return ata_pci_sff_init_one(dev, ppi, &sl82c105_sht, NULL);
321} 321}
322 322
323static const struct pci_device_id sl82c105[] = { 323static const struct pci_device_id sl82c105[] = {
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index bd546a389ce1..b181261f2743 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -66,7 +66,7 @@ static int triflex_prereset(struct ata_link *link, unsigned long deadline)
66 if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no])) 66 if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no]))
67 return -ENOENT; 67 return -ENOENT;
68 68
69 return ata_std_prereset(link, deadline); 69 return ata_sff_prereset(link, deadline);
70} 70}
71 71
72 72
@@ -201,7 +201,7 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)
201 if (!printed_version++) 201 if (!printed_version++)
202 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n"); 202 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
203 203
204 return ata_pci_init_one(dev, ppi, &triflex_sht, NULL); 204 return ata_pci_sff_init_one(dev, ppi, &triflex_sht, NULL);
205} 205}
206 206
207static const struct pci_device_id triflex[] = { 207static const struct pci_device_id triflex[] = {
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 2928fa173132..4b85f84fbe76 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -210,7 +210,7 @@ static int via_pre_reset(struct ata_link *link, unsigned long deadline)
210 return -ENOENT; 210 return -ENOENT;
211 } 211 }
212 212
213 return ata_std_prereset(link, deadline); 213 return ata_sff_prereset(link, deadline);
214} 214}
215 215
216 216
@@ -336,7 +336,7 @@ static struct ata_port_operations via_port_ops = {
336 336
337static struct ata_port_operations via_port_ops_noirq = { 337static struct ata_port_operations via_port_ops_noirq = {
338 .inherits = &via_port_ops, 338 .inherits = &via_port_ops,
339 .data_xfer = ata_data_xfer_noirq, 339 .data_xfer = ata_sff_data_xfer_noirq,
340}; 340};
341 341
342/** 342/**
@@ -511,7 +511,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
511 } 511 }
512 512
513 /* We have established the device type, now fire it up */ 513 /* We have established the device type, now fire it up */
514 return ata_pci_init_one(pdev, ppi, &via_sht, (void *)config); 514 return ata_pci_sff_init_one(pdev, ppi, &via_sht, (void *)config);
515} 515}
516 516
517#ifdef CONFIG_PM 517#ifdef CONFIG_PM
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index f235bb0d6139..cc18231e9334 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -116,7 +116,7 @@ static unsigned int winbond_data_xfer(struct ata_device *dev,
116 buflen += 4 - slop; 116 buflen += 4 - slop;
117 } 117 }
118 } else 118 } else
119 buflen = ata_data_xfer(dev, buf, buflen, rw); 119 buflen = ata_sff_data_xfer(dev, buf, buflen, rw);
120 120
121 return buflen; 121 return buflen;
122} 122}
@@ -198,7 +198,7 @@ static __init int winbond_init_one(unsigned long port)
198 ap->ioaddr.cmd_addr = cmd_addr; 198 ap->ioaddr.cmd_addr = cmd_addr;
199 ap->ioaddr.altstatus_addr = ctl_addr; 199 ap->ioaddr.altstatus_addr = ctl_addr;
200 ap->ioaddr.ctl_addr = ctl_addr; 200 ap->ioaddr.ctl_addr = ctl_addr;
201 ata_std_ports(&ap->ioaddr); 201 ata_sff_std_ports(&ap->ioaddr);
202 202
203 /* hook in a private data structure per channel */ 203 /* hook in a private data structure per channel */
204 host->private_data = &winbond_data[nr_winbond_host]; 204 host->private_data = &winbond_data[nr_winbond_host];
@@ -206,7 +206,7 @@ static __init int winbond_init_one(unsigned long port)
206 winbond_data[nr_winbond_host].platform_dev = pdev; 206 winbond_data[nr_winbond_host].platform_dev = pdev;
207 207
208 /* activate */ 208 /* activate */
209 rc = ata_host_activate(host, 14 + i, ata_interrupt, 0, 209 rc = ata_host_activate(host, 14 + i, ata_sff_interrupt, 0,
210 &winbond_sht); 210 &winbond_sht);
211 if (rc) 211 if (rc)
212 goto err_unregister; 212 goto err_unregister;
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index c431bf36f9ba..be53545c9f64 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -208,7 +208,7 @@ static void adma_reinit_engine(struct ata_port *ap)
208 208
209 /* mask/clear ATA interrupts */ 209 /* mask/clear ATA interrupts */
210 writeb(ATA_NIEN, ap->ioaddr.ctl_addr); 210 writeb(ATA_NIEN, ap->ioaddr.ctl_addr);
211 ata_check_status(ap); 211 ata_sff_check_status(ap);
212 212
213 /* reset the ADMA engine */ 213 /* reset the ADMA engine */
214 adma_reset_engine(ap); 214 adma_reset_engine(ap);
@@ -243,7 +243,7 @@ static void adma_freeze(struct ata_port *ap)
243 243
244 /* mask/clear ATA interrupts */ 244 /* mask/clear ATA interrupts */
245 writeb(ATA_NIEN, ap->ioaddr.ctl_addr); 245 writeb(ATA_NIEN, ap->ioaddr.ctl_addr);
246 ata_check_status(ap); 246 ata_sff_check_status(ap);
247 247
248 /* reset ADMA to idle state */ 248 /* reset ADMA to idle state */
249 writew(aPIOMD4 | aNIEN | aRSTADM, chan + ADMA_CONTROL); 249 writew(aPIOMD4 | aNIEN | aRSTADM, chan + ADMA_CONTROL);
@@ -266,7 +266,7 @@ static int adma_prereset(struct ata_link *link, unsigned long deadline)
266 pp->state = adma_state_mmio; 266 pp->state = adma_state_mmio;
267 adma_reinit_engine(ap); 267 adma_reinit_engine(ap);
268 268
269 return ata_std_prereset(link, deadline); 269 return ata_sff_prereset(link, deadline);
270} 270}
271 271
272static int adma_fill_sg(struct ata_queued_cmd *qc) 272static int adma_fill_sg(struct ata_queued_cmd *qc)
@@ -322,7 +322,7 @@ static void adma_qc_prep(struct ata_queued_cmd *qc)
322 322
323 adma_enter_reg_mode(qc->ap); 323 adma_enter_reg_mode(qc->ap);
324 if (qc->tf.protocol != ATA_PROT_DMA) { 324 if (qc->tf.protocol != ATA_PROT_DMA) {
325 ata_qc_prep(qc); 325 ata_sff_qc_prep(qc);
326 return; 326 return;
327 } 327 }
328 328
@@ -421,7 +421,7 @@ static unsigned int adma_qc_issue(struct ata_queued_cmd *qc)
421 } 421 }
422 422
423 pp->state = adma_state_mmio; 423 pp->state = adma_state_mmio;
424 return ata_qc_issue_prot(qc); 424 return ata_sff_qc_issue(qc);
425} 425}
426 426
427static inline unsigned int adma_intr_pkt(struct ata_host *host) 427static inline unsigned int adma_intr_pkt(struct ata_host *host)
@@ -492,7 +492,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
492 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) { 492 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
493 493
494 /* check main status, clearing INTRQ */ 494 /* check main status, clearing INTRQ */
495 u8 status = ata_check_status(ap); 495 u8 status = ata_sff_check_status(ap);
496 if ((status & ATA_BUSY)) 496 if ((status & ATA_BUSY))
497 continue; 497 continue;
498 DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n", 498 DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
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");
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 16c15ed3536e..fa75df634c75 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1386,7 +1386,7 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc)
1386 * shadow block, etc registers. 1386 * shadow block, etc registers.
1387 */ 1387 */
1388 mv_stop_edma(ap); 1388 mv_stop_edma(ap);
1389 return ata_qc_issue_prot(qc); 1389 return ata_sff_qc_issue(qc);
1390 } 1390 }
1391 1391
1392 mv_start_dma(ap, port_mmio, pp, qc->tf.protocol); 1392 mv_start_dma(ap, port_mmio, pp, qc->tf.protocol);
@@ -2362,7 +2362,7 @@ comreset_retry:
2362 */ 2362 */
2363 retry = 20; 2363 retry = 20;
2364 while (1) { 2364 while (1) {
2365 u8 drv_stat = ata_check_status(ap); 2365 u8 drv_stat = ata_sff_check_status(ap);
2366 if ((drv_stat != 0x80) && (drv_stat != 0x7f)) 2366 if ((drv_stat != 0x80) && (drv_stat != 0x7f))
2367 break; 2367 break;
2368 msleep(500); 2368 msleep(500);
@@ -2377,7 +2377,7 @@ comreset_retry:
2377 */ 2377 */
2378 2378
2379 /* finally, read device signature from TF registers */ 2379 /* finally, read device signature from TF registers */
2380 *class = ata_dev_try_classify(ap->link.device, 1, NULL); 2380 *class = ata_sff_dev_classify(ap->link.device, 1, NULL);
2381 2381
2382 writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); 2382 writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
2383 2383
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 95fd0cd28b49..63cc43765f04 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -730,7 +730,7 @@ static void nv_adma_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
730 ADMA mode could abort outstanding commands. */ 730 ADMA mode could abort outstanding commands. */
731 nv_adma_register_mode(ap); 731 nv_adma_register_mode(ap);
732 732
733 ata_tf_read(ap, tf); 733 ata_sff_tf_read(ap, tf);
734} 734}
735 735
736static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb) 736static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb)
@@ -844,12 +844,12 @@ static int nv_host_intr(struct ata_port *ap, u8 irq_stat)
844 844
845 /* DEV interrupt w/ no active qc? */ 845 /* DEV interrupt w/ no active qc? */
846 if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) { 846 if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) {
847 ata_check_status(ap); 847 ata_sff_check_status(ap);
848 return 1; 848 return 1;
849 } 849 }
850 850
851 /* handle interrupt */ 851 /* handle interrupt */
852 return ata_host_intr(ap, qc); 852 return ata_sff_host_intr(ap, qc);
853} 853}
854 854
855static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance) 855static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
@@ -1028,7 +1028,7 @@ static void nv_adma_irq_clear(struct ata_port *ap)
1028 u32 notifier_clears[2]; 1028 u32 notifier_clears[2];
1029 1029
1030 if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) { 1030 if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) {
1031 ata_bmdma_irq_clear(ap); 1031 ata_sff_irq_clear(ap);
1032 return; 1032 return;
1033 } 1033 }
1034 1034
@@ -1059,7 +1059,7 @@ static void nv_adma_post_internal_cmd(struct ata_queued_cmd *qc)
1059 struct nv_adma_port_priv *pp = qc->ap->private_data; 1059 struct nv_adma_port_priv *pp = qc->ap->private_data;
1060 1060
1061 if (pp->flags & NV_ADMA_PORT_REGISTER_MODE) 1061 if (pp->flags & NV_ADMA_PORT_REGISTER_MODE)
1062 ata_bmdma_post_internal_cmd(qc); 1062 ata_sff_post_internal_cmd(qc);
1063} 1063}
1064 1064
1065static int nv_adma_port_start(struct ata_port *ap) 1065static int nv_adma_port_start(struct ata_port *ap)
@@ -1336,7 +1336,7 @@ static void nv_adma_qc_prep(struct ata_queued_cmd *qc)
1336 BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) && 1336 BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) &&
1337 (qc->flags & ATA_QCFLAG_DMAMAP)); 1337 (qc->flags & ATA_QCFLAG_DMAMAP));
1338 nv_adma_register_mode(qc->ap); 1338 nv_adma_register_mode(qc->ap);
1339 ata_qc_prep(qc); 1339 ata_sff_qc_prep(qc);
1340 return; 1340 return;
1341 } 1341 }
1342 1342
@@ -1395,7 +1395,7 @@ static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc)
1395 BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) && 1395 BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) &&
1396 (qc->flags & ATA_QCFLAG_DMAMAP)); 1396 (qc->flags & ATA_QCFLAG_DMAMAP));
1397 nv_adma_register_mode(qc->ap); 1397 nv_adma_register_mode(qc->ap);
1398 return ata_qc_issue_prot(qc); 1398 return ata_sff_qc_issue(qc);
1399 } else 1399 } else
1400 nv_adma_mode(qc->ap); 1400 nv_adma_mode(qc->ap);
1401 1401
@@ -1436,7 +1436,7 @@ static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance)
1436 1436
1437 qc = ata_qc_from_tag(ap, ap->link.active_tag); 1437 qc = ata_qc_from_tag(ap, ap->link.active_tag);
1438 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) 1438 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)))
1439 handled += ata_host_intr(ap, qc); 1439 handled += ata_sff_host_intr(ap, qc);
1440 else 1440 else
1441 // No request pending? Clear interrupt status 1441 // No request pending? Clear interrupt status
1442 // anyway, in case there's one pending. 1442 // anyway, in case there's one pending.
@@ -1571,7 +1571,7 @@ static void nv_mcp55_freeze(struct ata_port *ap)
1571 mask = readl(mmio_base + NV_INT_ENABLE_MCP55); 1571 mask = readl(mmio_base + NV_INT_ENABLE_MCP55);
1572 mask &= ~(NV_INT_ALL_MCP55 << shift); 1572 mask &= ~(NV_INT_ALL_MCP55 << shift);
1573 writel(mask, mmio_base + NV_INT_ENABLE_MCP55); 1573 writel(mask, mmio_base + NV_INT_ENABLE_MCP55);
1574 ata_bmdma_freeze(ap); 1574 ata_sff_freeze(ap);
1575} 1575}
1576 1576
1577static void nv_mcp55_thaw(struct ata_port *ap) 1577static void nv_mcp55_thaw(struct ata_port *ap)
@@ -1585,7 +1585,7 @@ static void nv_mcp55_thaw(struct ata_port *ap)
1585 mask = readl(mmio_base + NV_INT_ENABLE_MCP55); 1585 mask = readl(mmio_base + NV_INT_ENABLE_MCP55);
1586 mask |= (NV_INT_MASK_MCP55 << shift); 1586 mask |= (NV_INT_MASK_MCP55 << shift);
1587 writel(mask, mmio_base + NV_INT_ENABLE_MCP55); 1587 writel(mask, mmio_base + NV_INT_ENABLE_MCP55);
1588 ata_bmdma_thaw(ap); 1588 ata_sff_thaw(ap);
1589} 1589}
1590 1590
1591static int nv_hardreset(struct ata_link *link, unsigned int *class, 1591static int nv_hardreset(struct ata_link *link, unsigned int *class,
@@ -1597,7 +1597,7 @@ static int nv_hardreset(struct ata_link *link, unsigned int *class,
1597 * some controllers. Don't classify on hardreset. For more 1597 * some controllers. Don't classify on hardreset. For more
1598 * info, see http://bugzilla.kernel.org/show_bug.cgi?id=3352 1598 * info, see http://bugzilla.kernel.org/show_bug.cgi?id=3352
1599 */ 1599 */
1600 return sata_std_hardreset(link, &dummy, deadline); 1600 return sata_sff_hardreset(link, &dummy, deadline);
1601} 1601}
1602 1602
1603static void nv_adma_error_handler(struct ata_port *ap) 1603static void nv_adma_error_handler(struct ata_port *ap)
@@ -1653,7 +1653,7 @@ static void nv_adma_error_handler(struct ata_port *ap)
1653 readw(mmio + NV_ADMA_CTL); /* flush posted write */ 1653 readw(mmio + NV_ADMA_CTL); /* flush posted write */
1654 } 1654 }
1655 1655
1656 ata_bmdma_error_handler(ap); 1656 ata_sff_error_handler(ap);
1657} 1657}
1658 1658
1659static void nv_swncq_qc_to_dq(struct ata_port *ap, struct ata_queued_cmd *qc) 1659static void nv_swncq_qc_to_dq(struct ata_port *ap, struct ata_queued_cmd *qc)
@@ -1779,7 +1779,7 @@ static void nv_swncq_error_handler(struct ata_port *ap)
1779 ehc->i.action |= ATA_EH_RESET; 1779 ehc->i.action |= ATA_EH_RESET;
1780 } 1780 }
1781 1781
1782 ata_bmdma_error_handler(ap); 1782 ata_sff_error_handler(ap);
1783} 1783}
1784 1784
1785#ifdef CONFIG_PM 1785#ifdef CONFIG_PM
@@ -1925,7 +1925,7 @@ static int nv_swncq_port_start(struct ata_port *ap)
1925static void nv_swncq_qc_prep(struct ata_queued_cmd *qc) 1925static void nv_swncq_qc_prep(struct ata_queued_cmd *qc)
1926{ 1926{
1927 if (qc->tf.protocol != ATA_PROT_NCQ) { 1927 if (qc->tf.protocol != ATA_PROT_NCQ) {
1928 ata_qc_prep(qc); 1928 ata_sff_qc_prep(qc);
1929 return; 1929 return;
1930 } 1930 }
1931 1931
@@ -2001,7 +2001,7 @@ static unsigned int nv_swncq_qc_issue(struct ata_queued_cmd *qc)
2001 struct nv_swncq_port_priv *pp = ap->private_data; 2001 struct nv_swncq_port_priv *pp = ap->private_data;
2002 2002
2003 if (qc->tf.protocol != ATA_PROT_NCQ) 2003 if (qc->tf.protocol != ATA_PROT_NCQ)
2004 return ata_qc_issue_prot(qc); 2004 return ata_sff_qc_issue(qc);
2005 2005
2006 DPRINTK("Enter\n"); 2006 DPRINTK("Enter\n");
2007 2007
@@ -2350,7 +2350,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2350 2350
2351 ppi[0] = &nv_port_info[type]; 2351 ppi[0] = &nv_port_info[type];
2352 ipriv = ppi[0]->private_data; 2352 ipriv = ppi[0]->private_data;
2353 rc = ata_pci_prepare_sff_host(pdev, ppi, &host); 2353 rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
2354 if (rc) 2354 if (rc)
2355 return rc; 2355 return rc;
2356 2356
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 5a0a03a08abc..9923e860eae3 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -143,7 +143,7 @@ static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile
143static int pdc_check_atapi_dma(struct ata_queued_cmd *qc); 143static int pdc_check_atapi_dma(struct ata_queued_cmd *qc);
144static int pdc_old_sata_check_atapi_dma(struct ata_queued_cmd *qc); 144static int pdc_old_sata_check_atapi_dma(struct ata_queued_cmd *qc);
145static void pdc_irq_clear(struct ata_port *ap); 145static void pdc_irq_clear(struct ata_port *ap);
146static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc); 146static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc);
147static void pdc_freeze(struct ata_port *ap); 147static void pdc_freeze(struct ata_port *ap);
148static void pdc_sata_freeze(struct ata_port *ap); 148static void pdc_sata_freeze(struct ata_port *ap);
149static void pdc_thaw(struct ata_port *ap); 149static void pdc_thaw(struct ata_port *ap);
@@ -166,7 +166,7 @@ static const struct ata_port_operations pdc_common_ops = {
166 .exec_command = pdc_exec_command_mmio, 166 .exec_command = pdc_exec_command_mmio,
167 .check_atapi_dma = pdc_check_atapi_dma, 167 .check_atapi_dma = pdc_check_atapi_dma,
168 .qc_prep = pdc_qc_prep, 168 .qc_prep = pdc_qc_prep,
169 .qc_issue = pdc_qc_issue_prot, 169 .qc_issue = pdc_qc_issue,
170 .irq_clear = pdc_irq_clear, 170 .irq_clear = pdc_irq_clear,
171 171
172 .post_internal_cmd = pdc_post_internal_cmd, 172 .post_internal_cmd = pdc_post_internal_cmd,
@@ -894,7 +894,7 @@ static inline void pdc_packet_start(struct ata_queued_cmd *qc)
894 readl(ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */ 894 readl(ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */
895} 895}
896 896
897static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc) 897static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc)
898{ 898{
899 switch (qc->tf.protocol) { 899 switch (qc->tf.protocol) {
900 case ATAPI_PROT_NODATA: 900 case ATAPI_PROT_NODATA:
@@ -914,20 +914,20 @@ static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc)
914 break; 914 break;
915 } 915 }
916 916
917 return ata_qc_issue_prot(qc); 917 return ata_sff_qc_issue(qc);
918} 918}
919 919
920static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf) 920static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf)
921{ 921{
922 WARN_ON(tf->protocol == ATA_PROT_DMA || tf->protocol == ATAPI_PROT_DMA); 922 WARN_ON(tf->protocol == ATA_PROT_DMA || tf->protocol == ATAPI_PROT_DMA);
923 ata_tf_load(ap, tf); 923 ata_sff_tf_load(ap, tf);
924} 924}
925 925
926static void pdc_exec_command_mmio(struct ata_port *ap, 926static void pdc_exec_command_mmio(struct ata_port *ap,
927 const struct ata_taskfile *tf) 927 const struct ata_taskfile *tf)
928{ 928{
929 WARN_ON(tf->protocol == ATA_PROT_DMA || tf->protocol == ATAPI_PROT_DMA); 929 WARN_ON(tf->protocol == ATA_PROT_DMA || tf->protocol == ATAPI_PROT_DMA);
930 ata_exec_command(ap, tf); 930 ata_sff_exec_command(ap, tf);
931} 931}
932 932
933static int pdc_check_atapi_dma(struct ata_queued_cmd *qc) 933static int pdc_check_atapi_dma(struct ata_queued_cmd *qc)
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 2ceb0990bcd8..1600107047cf 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -239,7 +239,7 @@ static int qs_prereset(struct ata_link *link, unsigned long deadline)
239 struct ata_port *ap = link->ap; 239 struct ata_port *ap = link->ap;
240 240
241 qs_reset_channel_logic(ap); 241 qs_reset_channel_logic(ap);
242 return ata_std_prereset(link, deadline); 242 return ata_sff_prereset(link, deadline);
243} 243}
244 244
245static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val) 245static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
@@ -303,7 +303,7 @@ static void qs_qc_prep(struct ata_queued_cmd *qc)
303 303
304 qs_enter_reg_mode(qc->ap); 304 qs_enter_reg_mode(qc->ap);
305 if (qc->tf.protocol != ATA_PROT_DMA) { 305 if (qc->tf.protocol != ATA_PROT_DMA) {
306 ata_qc_prep(qc); 306 ata_sff_qc_prep(qc);
307 return; 307 return;
308 } 308 }
309 309
@@ -362,7 +362,7 @@ static unsigned int qs_qc_issue(struct ata_queued_cmd *qc)
362 } 362 }
363 363
364 pp->state = qs_state_mmio; 364 pp->state = qs_state_mmio;
365 return ata_qc_issue_prot(qc); 365 return ata_sff_qc_issue(qc);
366} 366}
367 367
368static void qs_do_or_die(struct ata_queued_cmd *qc, u8 status) 368static void qs_do_or_die(struct ata_queued_cmd *qc, u8 status)
@@ -451,7 +451,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
451 * and pretend we knew it was ours.. (ugh). 451 * and pretend we knew it was ours.. (ugh).
452 * This does not affect packet mode. 452 * This does not affect packet mode.
453 */ 453 */
454 ata_check_status(ap); 454 ata_sff_check_status(ap);
455 handled = 1; 455 handled = 1;
456 continue; 456 continue;
457 } 457 }
@@ -459,7 +459,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
459 if (!pp || pp->state != qs_state_mmio) 459 if (!pp || pp->state != qs_state_mmio)
460 continue; 460 continue;
461 if (!(qc->tf.flags & ATA_TFLAG_POLLING)) 461 if (!(qc->tf.flags & ATA_TFLAG_POLLING))
462 handled |= ata_host_intr(ap, qc); 462 handled |= ata_sff_host_intr(ap, qc);
463 } 463 }
464 } 464 }
465 return handled; 465 return handled;
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");
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 9089c7ab5000..6b8e45ba32e8 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -309,7 +309,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
309 break; 309 break;
310 } 310 }
311 311
312 rc = ata_pci_prepare_sff_host(pdev, ppi, &host); 312 rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
313 if (rc) 313 if (rc)
314 return rc; 314 return rc;
315 315
@@ -327,8 +327,8 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
327 327
328 pci_set_master(pdev); 328 pci_set_master(pdev);
329 pci_intx(pdev, 1); 329 pci_intx(pdev, 1);
330 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 330 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
331 &sis_sht); 331 IRQF_SHARED, &sis_sht);
332} 332}
333 333
334static int __init sis_init(void) 334static int __init sis_init(void)
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 8636f164256e..7b941106f7de 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -492,8 +492,8 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *en
492 writel(0x0, mmio_base + K2_SATA_SIM_OFFSET); 492 writel(0x0, mmio_base + K2_SATA_SIM_OFFSET);
493 493
494 pci_set_master(pdev); 494 pci_set_master(pdev);
495 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 495 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
496 &k2_sata_sht); 496 IRQF_SHARED, &k2_sata_sht);
497} 497}
498 498
499/* 0x240 is device ID for Apple K2 device 499/* 0x240 is device ID for Apple K2 device
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 8d7f39532d4a..40be2ff60902 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -232,7 +232,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host,
232static void pdc20621_put_to_dimm(struct ata_host *host, 232static void pdc20621_put_to_dimm(struct ata_host *host,
233 void *psource, u32 offset, u32 size); 233 void *psource, u32 offset, u32 size);
234static void pdc20621_irq_clear(struct ata_port *ap); 234static void pdc20621_irq_clear(struct ata_port *ap);
235static unsigned int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc); 235static unsigned int pdc20621_qc_issue(struct ata_queued_cmd *qc);
236 236
237 237
238static struct scsi_host_template pdc_sata_sht = { 238static struct scsi_host_template pdc_sata_sht = {
@@ -244,17 +244,17 @@ static struct scsi_host_template pdc_sata_sht = {
244/* TODO: inherit from base port_ops after converting to new EH */ 244/* TODO: inherit from base port_ops after converting to new EH */
245static struct ata_port_operations pdc_20621_ops = { 245static struct ata_port_operations pdc_20621_ops = {
246 .tf_load = pdc_tf_load_mmio, 246 .tf_load = pdc_tf_load_mmio,
247 .tf_read = ata_tf_read, 247 .tf_read = ata_sff_tf_read,
248 .check_status = ata_check_status, 248 .check_status = ata_sff_check_status,
249 .exec_command = pdc_exec_command_mmio, 249 .exec_command = pdc_exec_command_mmio,
250 .dev_select = ata_std_dev_select, 250 .dev_select = ata_sff_dev_select,
251 .phy_reset = pdc_20621_phy_reset, 251 .phy_reset = pdc_20621_phy_reset,
252 .qc_prep = pdc20621_qc_prep, 252 .qc_prep = pdc20621_qc_prep,
253 .qc_issue = pdc20621_qc_issue_prot, 253 .qc_issue = pdc20621_qc_issue,
254 .data_xfer = ata_data_xfer, 254 .data_xfer = ata_sff_data_xfer,
255 .eng_timeout = pdc_eng_timeout, 255 .eng_timeout = pdc_eng_timeout,
256 .irq_clear = pdc20621_irq_clear, 256 .irq_clear = pdc20621_irq_clear,
257 .irq_on = ata_irq_on, 257 .irq_on = ata_sff_irq_on,
258 .port_start = pdc_port_start, 258 .port_start = pdc_port_start,
259}; 259};
260 260
@@ -682,7 +682,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)
682 } 682 }
683} 683}
684 684
685static unsigned int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc) 685static unsigned int pdc20621_qc_issue(struct ata_queued_cmd *qc)
686{ 686{
687 switch (qc->tf.protocol) { 687 switch (qc->tf.protocol) {
688 case ATA_PROT_DMA: 688 case ATA_PROT_DMA:
@@ -698,7 +698,7 @@ static unsigned int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc)
698 break; 698 break;
699 } 699 }
700 700
701 return ata_qc_issue_prot(qc); 701 return ata_sff_qc_issue(qc);
702} 702}
703 703
704static inline unsigned int pdc20621_host_intr(struct ata_port *ap, 704static inline unsigned int pdc20621_host_intr(struct ata_port *ap,
@@ -770,7 +770,7 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap,
770 /* command completion, but no data xfer */ 770 /* command completion, but no data xfer */
771 } else if (qc->tf.protocol == ATA_PROT_NODATA) { 771 } else if (qc->tf.protocol == ATA_PROT_NODATA) {
772 772
773 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); 773 status = ata_sff_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
774 DPRINTK("BUS_NODATA (drv_stat 0x%X)\n", status); 774 DPRINTK("BUS_NODATA (drv_stat 0x%X)\n", status);
775 qc->err_mask |= ac_err_mask(status); 775 qc->err_mask |= ac_err_mask(status);
776 ata_qc_complete(qc); 776 ata_qc_complete(qc);
@@ -879,7 +879,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
879 break; 879 break;
880 880
881 default: 881 default:
882 drv_stat = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); 882 drv_stat = ata_sff_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
883 883
884 ata_port_printk(ap, KERN_ERR, 884 ata_port_printk(ap, KERN_ERR,
885 "unknown timeout, cmd 0x%x stat 0x%x\n", 885 "unknown timeout, cmd 0x%x stat 0x%x\n",
@@ -898,7 +898,7 @@ static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf)
898{ 898{
899 WARN_ON(tf->protocol == ATA_PROT_DMA || 899 WARN_ON(tf->protocol == ATA_PROT_DMA ||
900 tf->protocol == ATA_PROT_NODATA); 900 tf->protocol == ATA_PROT_NODATA);
901 ata_tf_load(ap, tf); 901 ata_sff_tf_load(ap, tf);
902} 902}
903 903
904 904
@@ -906,7 +906,7 @@ static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile
906{ 906{
907 WARN_ON(tf->protocol == ATA_PROT_DMA || 907 WARN_ON(tf->protocol == ATA_PROT_DMA ||
908 tf->protocol == ATA_PROT_NODATA); 908 tf->protocol == ATA_PROT_NODATA);
909 ata_exec_command(ap, tf); 909 ata_sff_exec_command(ap, tf);
910} 910}
911 911
912 912
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 6ecd13fefa1a..f277cea904ce 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -175,11 +175,11 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
175 host->private_data = hpriv; 175 host->private_data = hpriv;
176 176
177 /* the first two ports are standard SFF */ 177 /* the first two ports are standard SFF */
178 rc = ata_pci_init_sff_host(host); 178 rc = ata_pci_sff_init_host(host);
179 if (rc) 179 if (rc)
180 return rc; 180 return rc;
181 181
182 rc = ata_pci_init_bmdma(host); 182 rc = ata_pci_bmdma_init(host);
183 if (rc) 183 if (rc)
184 return rc; 184 return rc;
185 185
@@ -200,7 +200,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
200 ((unsigned long)iomap[1] | ATA_PCI_CTL_OFS) + 4; 200 ((unsigned long)iomap[1] | ATA_PCI_CTL_OFS) + 4;
201 ioaddr->bmdma_addr = iomap[4] + 16; 201 ioaddr->bmdma_addr = iomap[4] + 16;
202 hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4; 202 hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4;
203 ata_std_ports(ioaddr); 203 ata_sff_std_ports(ioaddr);
204 204
205 ata_port_desc(host->ports[2], 205 ata_port_desc(host->ports[2],
206 "cmd 0x%llx ctl 0x%llx bmdma 0x%llx", 206 "cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
@@ -215,7 +215,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
215 ((unsigned long)iomap[3] | ATA_PCI_CTL_OFS) + 4; 215 ((unsigned long)iomap[3] | ATA_PCI_CTL_OFS) + 4;
216 ioaddr->bmdma_addr = iomap[4] + 24; 216 ioaddr->bmdma_addr = iomap[4] + 24;
217 hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5; 217 hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5;
218 ata_std_ports(ioaddr); 218 ata_sff_std_ports(ioaddr);
219 219
220 ata_port_desc(host->ports[2], 220 ata_port_desc(host->ports[2],
221 "cmd 0x%llx ctl 0x%llx bmdma 0x%llx", 221 "cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
@@ -242,8 +242,8 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
242 242
243 pci_set_master(pdev); 243 pci_set_master(pdev);
244 pci_intx(pdev, 1); 244 pci_intx(pdev, 1);
245 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 245 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
246 &uli_sht); 246 IRQF_SHARED, &uli_sht);
247} 247}
248 248
249static int __init uli_init(void) 249static int __init uli_init(void)
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 4bc6e849af2c..9323bc2a2785 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -174,7 +174,7 @@ static void svia_noop_freeze(struct ata_port *ap)
174 * certain way. Leave it alone and just clear pending IRQ. 174 * certain way. Leave it alone and just clear pending IRQ.
175 */ 175 */
176 ap->ops->check_status(ap); 176 ap->ops->check_status(ap);
177 ata_bmdma_irq_clear(ap); 177 ata_sff_irq_clear(ap);
178} 178}
179 179
180/** 180/**
@@ -242,7 +242,7 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)
242 242
243 skip_scr: 243 skip_scr:
244 /* wait for !BSY */ 244 /* wait for !BSY */
245 ata_wait_ready(ap, deadline); 245 ata_sff_wait_ready(ap, deadline);
246 246
247 return 0; 247 return 0;
248} 248}
@@ -304,7 +304,7 @@ static void vt6421_init_addrs(struct ata_port *ap)
304 ioaddr->bmdma_addr = bmdma_addr; 304 ioaddr->bmdma_addr = bmdma_addr;
305 ioaddr->scr_addr = vt6421_scr_addr(iomap[5], ap->port_no); 305 ioaddr->scr_addr = vt6421_scr_addr(iomap[5], ap->port_no);
306 306
307 ata_std_ports(ioaddr); 307 ata_sff_std_ports(ioaddr);
308 308
309 ata_port_pbar_desc(ap, ap->port_no, -1, "port"); 309 ata_port_pbar_desc(ap, ap->port_no, -1, "port");
310 ata_port_pbar_desc(ap, 4, ap->port_no * 8, "bmdma"); 310 ata_port_pbar_desc(ap, 4, ap->port_no * 8, "bmdma");
@@ -316,7 +316,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
316 struct ata_host *host; 316 struct ata_host *host;
317 int rc; 317 int rc;
318 318
319 rc = ata_pci_prepare_sff_host(pdev, ppi, &host); 319 rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
320 if (rc) 320 if (rc)
321 return rc; 321 return rc;
322 *r_host = host; 322 *r_host = host;
@@ -448,8 +448,8 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
448 svia_configure(pdev); 448 svia_configure(pdev);
449 449
450 pci_set_master(pdev); 450 pci_set_master(pdev);
451 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 451 return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
452 &svia_sht); 452 IRQF_SHARED, &svia_sht);
453} 453}
454 454
455static int __init svia_init(void) 455static int __init svia_init(void)
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index fb3a88722664..2c3c7693c750 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -200,7 +200,7 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
200 struct ata_ioports *ioaddr = &ap->ioaddr; 200 struct ata_ioports *ioaddr = &ap->ioaddr;
201 u16 nsect, lbal, lbam, lbah, feature; 201 u16 nsect, lbal, lbam, lbah, feature;
202 202
203 tf->command = ata_check_status(ap); 203 tf->command = ata_sff_check_status(ap);
204 tf->device = readw(ioaddr->device_addr); 204 tf->device = readw(ioaddr->device_addr);
205 feature = readw(ioaddr->error_addr); 205 feature = readw(ioaddr->error_addr);
206 nsect = readw(ioaddr->nsect_addr); 206 nsect = readw(ioaddr->nsect_addr);
@@ -243,7 +243,7 @@ static void vsc_port_intr(u8 port_status, struct ata_port *ap)
243 243
244 qc = ata_qc_from_tag(ap, ap->link.active_tag); 244 qc = ata_qc_from_tag(ap, ap->link.active_tag);
245 if (qc && likely(!(qc->tf.flags & ATA_TFLAG_POLLING))) 245 if (qc && likely(!(qc->tf.flags & ATA_TFLAG_POLLING)))
246 handled = ata_host_intr(ap, qc); 246 handled = ata_sff_host_intr(ap, qc);
247 247
248 /* We received an interrupt during a polled command, 248 /* We received an interrupt during a polled command,
249 * or some other spurious condition. Interrupt reporting 249 * or some other spurious condition. Interrupt reporting
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 16:04:11 -0500