summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-taskfile.c
diff options
context:
space:
mode:
authorMartin Dalecki <dalecki@evision-ventures.com>2002-05-05 01:03:45 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-05-05 01:03:45 -0700
commit3ddddcf2bde93d0a7c56531bab00a7aa081407c5 (patch)
tree753aef34908143cc95698c618f8f808b6f072e28 /drivers/ide/ide-taskfile.c
parentab08629c9697b471bb431a91fe238893fcc123ab (diff)
[PATCH] 2.5.13 IDE 53
- Start splitting the functions for host chip handling in to separate entities. This change is quite sensitive and may cause some trouble but it's for certain worth it anyway, because it should for example provide a much better infrastructure for th handling of different architectures.
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r--drivers/ide/ide-taskfile.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 41ac1895de09..fad49c558326 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -461,7 +461,6 @@ ide_startstop_t ata_taskfile(struct ata_device *drive,
* regular dma proc -- basically split stuff that needs to act
* on a request from things like ide_dma_check etc.
*/
- ide_dma_action_t dma_act;
if (!drive->using_dma)
return ide_started;
@@ -469,10 +468,10 @@ ide_startstop_t ata_taskfile(struct ata_device *drive,
/* for dma commands we don't set the handler */
if (args->taskfile.command == WIN_WRITEDMA
|| args->taskfile.command == WIN_WRITEDMA_EXT)
- dma_act = ide_dma_write;
+ udma_write(drive, rq);
else if (args->taskfile.command == WIN_READDMA
|| args->taskfile.command == WIN_READDMA_EXT)
- dma_act = ide_dma_read;
+ udma_read(drive, rq);
#ifdef CONFIG_BLK_DEV_IDE_TCQ
else if (args->taskfile.command == WIN_WRITEDMA_QUEUED
|| args->taskfile.command == WIN_WRITEDMA_QUEUED_EXT
@@ -484,10 +483,6 @@ ide_startstop_t ata_taskfile(struct ata_device *drive,
printk("ata_taskfile: unknown command %x\n", args->taskfile.command);
return ide_stopped;
}
-
-
- if (drive->channel->udma(dma_act, drive, rq))
- return ide_stopped;
}
return ide_started;