aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_qstor.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_qstor.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_qstor.c')
-rw-r--r--drivers/ata/sata_qstor.c10
1 files changed, 5 insertions, 5 deletions
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;