Skip to content

Commit

Permalink
trm290: use custom ->dma_{start,end} to handle trm290_prepare_drive()
Browse files Browse the repository at this point in the history
Use custom ->dma_{start,end} methods to handle trm290_prepare_drive()
there instead of in ->dma_setup method.

There should be no functional changes caused by this patch
(DMA support is disabled currently in trm290.c).

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Mar 31, 2009
1 parent a6d67ff commit 7526efa
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/ide/trm290.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
if (cmd->tf_flags & IDE_TFLAG_WRITE) {
#ifdef TRM290_NO_DMA_WRITES
/* always use PIO for writes */
trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1;
#endif
rw = 1;
Expand All @@ -195,11 +194,8 @@ static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
if (count == 0) {
ide_map_sg(drive, cmd);
/* try PIO instead of DMA */
trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1;
}
/* select DMA xfer */
trm290_prepare_drive(drive, 1);
outl(hwif->dmatable_dma | rw, hwif->dma_base);
drive->waiting_for_dma = 1;
/* start DMA */
Expand All @@ -209,6 +205,7 @@ static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)

static void trm290_dma_start(ide_drive_t *drive)
{
trm290_prepare_drive(drive, 1);
}

static int trm290_dma_end(ide_drive_t *drive)
Expand All @@ -219,6 +216,8 @@ static int trm290_dma_end(ide_drive_t *drive)

status = inw(drive->hwif->dma_base + 2);

trm290_prepare_drive(drive, 0);

return status != 0x00ff;
}

Expand Down

0 comments on commit 7526efa

Please sign in to comment.