diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:38 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:38 -0400 |
commit | adb1af9803d167091c2cb4de14014185054bfe2c (patch) | |
tree | aeac3bd825abfb344b1b1b43e282756fb8069f49 /drivers/ide/ide-dma.c | |
parent | 22aa4b32a19b1f231d4ce7e9af6354b577a22a35 (diff) |
ide: pass command instead of request to ide_pio_datablock()
* Add IDE_TFLAG_FS taskfile flag and set it for REQ_TYPE_FS requests.
* Convert ->{in,out}put_data methods to take command instead of request
as an argument. Then convert pre_task_out_intr(), task_end_request(),
task_error(), task_in_unexpected(), ide_pio_sector(), ide_pio_multi()
and ide_pio_datablock() in similar way.
* Rename task_end_request() to ide_finish_cmd().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 12c11b71402e..54f17ae9225d 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -96,9 +96,9 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive) | |||
96 | 96 | ||
97 | if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) { | 97 | if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) { |
98 | if (!dma_stat) { | 98 | if (!dma_stat) { |
99 | struct request *rq = hwif->rq; | 99 | struct ide_cmd *cmd = &hwif->cmd; |
100 | 100 | ||
101 | task_end_request(drive, rq, stat); | 101 | ide_finish_cmd(drive, cmd, stat); |
102 | return ide_stopped; | 102 | return ide_stopped; |
103 | } | 103 | } |
104 | printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n", | 104 | printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n", |