diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:13 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:13 -0500 |
commit | 2fc573881957337c4ea1c84b92d2f27d076cad57 (patch) | |
tree | 790726063934a7ea8c384f2314d44bc03b22f779 /drivers/ide/ide-floppy.c | |
parent | 932aead6d21b631b2058255981824008a6eae32e (diff) |
ide: add ide_pktcmd_tf_load() helper
Add ide_pktcmd_tf_load() helper and convert ATAPI device drivers to use it.
There should be no functionality changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index d4fd064cc76c..ff8232ef9659 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -1067,13 +1067,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p | |||
1067 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) | 1067 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) |
1068 | dma = !hwif->dma_setup(drive); | 1068 | dma = !hwif->dma_setup(drive); |
1069 | 1069 | ||
1070 | if (IDE_CONTROL_REG) | 1070 | ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK | |
1071 | HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); | 1071 | IDE_TFLAG_OUT_DEVICE, bcount, dma); |
1072 | /* Use PIO/DMA */ | ||
1073 | hwif->OUTB(dma, IDE_FEATURE_REG); | ||
1074 | hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG); | ||
1075 | hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); | ||
1076 | HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG); | ||
1077 | 1072 | ||
1078 | if (dma) { /* Begin DMA, if necessary */ | 1073 | if (dma) { /* Begin DMA, if necessary */ |
1079 | set_bit(PC_DMA_IN_PROGRESS, &pc->flags); | 1074 | set_bit(PC_DMA_IN_PROGRESS, &pc->flags); |