diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:46 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:46 -0400 |
commit | 2298169418f43ba5e0919762a4bab95a1227872a (patch) | |
tree | 67cf3133c7bae747ad957c68a650534105a7d8e7 /drivers/ide/ide-floppy.c | |
parent | 130e886708d6e11f3d54e5d27c266578de56f343 (diff) |
ide: pass command to ide_map_sg()
* Set IDE_TFLAG_WRITE flag and ->rq also for ATA_CMD_PACKET
commands.
* Pass command to ->dma_setup method and update all its
implementations accordingly.
* Pass command instead of request to ide_build_sglist(),
*_build_dmatable() and ide_map_sg().
While at it:
* Fix scc_dma_setup() documentation + use ATA_DMA_WR define.
* Rename sgiioc4_build_dma_table() to sgiioc4_build_dmatable(),
change return value type to 'int' and drop unused 'ddir'
argument.
* Do some minor cleanups in [tx4939]ide_dma_setup().
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 8c518c6a6477..ee3e77a7a727 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -285,9 +285,13 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, | |||
285 | goto out_end; | 285 | goto out_end; |
286 | } | 286 | } |
287 | 287 | ||
288 | if (rq_data_dir(rq)) | ||
289 | cmd->tf_flags |= IDE_TFLAG_WRITE; | ||
290 | cmd->rq = rq; | ||
291 | |||
288 | if (blk_fs_request(rq) || pc->req_xfer) { | 292 | if (blk_fs_request(rq) || pc->req_xfer) { |
289 | ide_init_sg_cmd(cmd, rq->nr_sectors); | 293 | ide_init_sg_cmd(cmd, rq->nr_sectors); |
290 | ide_map_sg(drive, rq); | 294 | ide_map_sg(drive, cmd); |
291 | } | 295 | } |
292 | 296 | ||
293 | pc->sg = hwif->sg_table; | 297 | pc->sg = hwif->sg_table; |