diff options
author | Tejun Heo <htejun@gmail.com> | 2008-04-07 09:47:16 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:21 -0400 |
commit | 9363c3825ea9ad76561eb48a395349dd29211ed6 (patch) | |
tree | abe89a0f7c82b805d84b1a211c97b317f6628d5f /drivers/ata/pdc_adma.c | |
parent | b67a1064cb1c1d3b43e01e8b43a6a8dcdefed733 (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/pdc_adma.c')
-rw-r--r-- | drivers/ata/pdc_adma.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 | ||
272 | static int adma_fill_sg(struct ata_queued_cmd *qc) | 272 | static 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 | ||
427 | static inline unsigned int adma_intr_pkt(struct ata_host *host) | 427 | static 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", |