aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:16 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:16 -0500
commitf6e29e35cc0f9facf2eb0b0454f9b09021b5aa6f (patch)
tree66f022af5e3b1a7ef5a0854c684604b6d2b64a9c /include
parentba76ae3883ad9faa32a6b35271c6a407d6c96ca9 (diff)
ide-disk: use do_rw_taskfile() (take 2)
* Add IDE_TFLAG_DMA_PIO_FALLBACK taskfile flag to indicate the need to skip loading taskfile registers in do_rw_taskfile(). * Export do_rw_taskfile(). * Convert __ide_do_rw_disk() to use do_rw_taskfile(). * Unexport ide_tf_load(). * Unexport {pre_task_out,task_in}_intr() and make it static. * Remove incorrect comment about do_rw_taskfile() from <linux/ide.h>. There should be no functionality changes caused by this patch. v2: * Add missing blk_fs_request() check to task_dma_ok() (for VDMA). Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ide.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 721c9d8f41a2..c333a7528d94 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -912,6 +912,7 @@ enum {
912 IDE_TFLAG_FLAGGED_SET_IN_FLAGS = (1 << 16), 912 IDE_TFLAG_FLAGGED_SET_IN_FLAGS = (1 << 16),
913 IDE_TFLAG_IN_DATA = (1 << 17), 913 IDE_TFLAG_IN_DATA = (1 << 17),
914 IDE_TFLAG_CUSTOM_HANDLER = (1 << 18), 914 IDE_TFLAG_CUSTOM_HANDLER = (1 << 18),
915 IDE_TFLAG_DMA_PIO_FALLBACK = (1 << 19),
915}; 916};
916 917
917struct ide_taskfile { 918struct ide_taskfile {
@@ -965,13 +966,7 @@ extern int drive_is_ready(ide_drive_t *);
965 966
966void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8); 967void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8);
967 968
968/* 969ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
969 * taskfile io for disks for now...and builds request from ide_ioctl
970 */
971extern ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
972
973extern ide_startstop_t task_in_intr(ide_drive_t *);
974extern ide_startstop_t pre_task_out_intr(ide_drive_t *, struct request *);
975 970
976int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16); 971int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16);
977int ide_no_data_taskfile(ide_drive_t *, ide_task_t *); 972int ide_no_data_taskfile(ide_drive_t *, ide_task_t *);