aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_via.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/sata_via.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/sata_via.c')
-rw-r--r--drivers/ata/sata_via.c12
1 files changed, 6 insertions, 6 deletions
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)