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-io.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-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index f59c709052d2..47404f5526f1 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -228,11 +228,11 @@ static ide_startstop_t do_special (ide_drive_t *drive) | |||
228 | return ide_stopped; | 228 | return ide_stopped; |
229 | } | 229 | } |
230 | 230 | ||
231 | void ide_map_sg(ide_drive_t *drive, struct request *rq) | 231 | void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd) |
232 | { | 232 | { |
233 | ide_hwif_t *hwif = drive->hwif; | 233 | ide_hwif_t *hwif = drive->hwif; |
234 | struct ide_cmd *cmd = &hwif->cmd; | ||
235 | struct scatterlist *sg = hwif->sg_table; | 234 | struct scatterlist *sg = hwif->sg_table; |
235 | struct request *rq = cmd->rq; | ||
236 | 236 | ||
237 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { | 237 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { |
238 | sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); | 238 | sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); |
@@ -273,7 +273,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, | |||
273 | if (cmd) { | 273 | if (cmd) { |
274 | if (cmd->protocol == ATA_PROT_PIO) { | 274 | if (cmd->protocol == ATA_PROT_PIO) { |
275 | ide_init_sg_cmd(cmd, rq->nr_sectors); | 275 | ide_init_sg_cmd(cmd, rq->nr_sectors); |
276 | ide_map_sg(drive, rq); | 276 | ide_map_sg(drive, cmd); |
277 | } | 277 | } |
278 | 278 | ||
279 | return do_rw_taskfile(drive, cmd); | 279 | return do_rw_taskfile(drive, cmd); |