aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_hpt3x2n.c
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/pata_hpt3x2n.c
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/pata_hpt3x2n.c')
-rw-r--r--drivers/ata/pata_hpt3x2n.c10
1 files changed, 5 insertions, 5 deletions
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[] = {