aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:47 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:47 -0400
commit22117d6eaac50d366d9013c88318a869ea4d8739 (patch)
tree7dae55b028f8c7c249341f026257f94c88eed3cf /drivers/ide/ide-atapi.c
parent60c0cd02b254805691cdc61101ada6af7bd56fde (diff)
ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
* Rename dma_timer_expiry() to ide_dma_sff_timer_expiry() and export it. * Add ->dma_timer_expiry method and use it to set hwif->expiry for ATA_PROT_DMA protocol in do_rw_taskfile(). * Initialize ->dma_timer_expiry to ide_dma_sff_timer_expiry() for SFF hosts. * Move setting hwif->expiry from ide_execute_command() to its users and drop 'expiry' argument. * Use ide_execute_command() instead of ->dma_exec_cmd in do_rw_taskfile(). * Remove ->dma_exec_cmd method and its implementations. * Unexport ide_execute_command() and ide_dma_intr(). v2: * Fix CONFIG_BLK_DEV_IDEDMA=n build (noticed by Randy Dunlap). * Fix *dma_expiry naming (suggested by Sergei Shtylyov). There should be no functional changes caused by this patch. Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index f1b1b71cb74c..f7fe1decb59d 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -691,8 +691,9 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
691 if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) { 691 if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
692 if (drive->dma) 692 if (drive->dma)
693 drive->waiting_for_dma = 0; 693 drive->waiting_for_dma = 0;
694 hwif->expiry = expiry;
694 ide_execute_command(drive, ATA_CMD_PACKET, ide_transfer_pc, 695 ide_execute_command(drive, ATA_CMD_PACKET, ide_transfer_pc,
695 timeout, expiry); 696 timeout);
696 return ide_started; 697 return ide_started;
697 } else { 698 } else {
698 ide_execute_pkt_cmd(drive); 699 ide_execute_pkt_cmd(drive);