summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:15 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:15 +0100
commit1edee60e9d994f2b9a79b1333be39790683541fe (patch)
treef180358d478d5f9366267afd8c9ff2104a2cb930 /include
parenta7bbd20b50fb12b3a604c396b3d8a3449a43edcc (diff)
downloadlinux-3.10-1edee60e9d994f2b9a79b1333be39790683541fe.tar.gz
linux-3.10-1edee60e9d994f2b9a79b1333be39790683541fe.tar.bz2
linux-3.10-1edee60e9d994f2b9a79b1333be39790683541fe.zip
ide: merge flagged_taskfile() into do_rw_taskfile()
Based on the earlier work by Tejun Heo. task->data_phase == TASKFILE_MULTI_{IN,OUT} vs drive->mult_count == 0 check is needed also for ide_taskfile_ioctl() requests that don't have IDE_TFLAG_FLAGGED taskfile flag set. Cc: Tejun Heo <htejun@gmail.com> 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.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index c23ef2df2cb..849447572a6 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -972,11 +972,6 @@ void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8);
*/
extern ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
-/*
- * Special Flagged Register Validation Caller
- */
-extern ide_startstop_t flagged_taskfile(ide_drive_t *, ide_task_t *);
-
extern ide_startstop_t set_multmode_intr(ide_drive_t *);
extern ide_startstop_t set_geometry_intr(ide_drive_t *);
extern ide_startstop_t recal_intr(ide_drive_t *);