From 48cac27d1ce66a65492018eef3c3da027e5ed418 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 16 Jul 2008 20:33:43 +0200
Subject: [PATCH] --- yaml --- r: 102111 b: refs/heads/master c:
 07fe69d5d0b6e476cecaf75e81c0c6093571087b h: refs/heads/master i:   102109:
 1cf4d7fdaf676f1cbe4db6e6dce042719acc8d04   102107:
 e6023348ac54344640c6351c6283c67b2bf9e44f   102103:
 5530f670c9662b18d33ffd475000ef4dd3c52f54   102095:
 0f7f59460ef2b9ec756726cede6fe33c1ec445ab   102079:
 10de5357fe291d5d9b70fb420107be675abce581 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/ide/ide-taskfile.c | 22 +---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 054d2f39a1ef..69af8a658e95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e193c3e141df4b536ed077b29c83a96768333607
+refs/heads/master: 07fe69d5d0b6e476cecaf75e81c0c6093571087b
diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c
index cf55a48a7dd2..994a5161c040 100644
--- a/trunk/drivers/ide/ide-taskfile.c
+++ b/trunk/drivers/ide/ide-taskfile.c
@@ -62,25 +62,6 @@ int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)
 	return ide_raw_taskfile(drive, &args, buf, 1);
 }
 
-static int inline task_dma_ok(ide_task_t *task)
-{
-	if (blk_fs_request(task->rq) || (task->tf_flags & IDE_TFLAG_FLAGGED))
-		return 1;
-
-	switch (task->tf.command) {
-		case WIN_WRITEDMA_ONCE:
-		case WIN_WRITEDMA:
-		case WIN_WRITEDMA_EXT:
-		case WIN_READDMA_ONCE:
-		case WIN_READDMA:
-		case WIN_READDMA_EXT:
-		case WIN_IDENTIFY_DMA:
-			return 1;
-	}
-
-	return 0;
-}
-
 static ide_startstop_t task_no_data_intr(ide_drive_t *);
 static ide_startstop_t set_geometry_intr(ide_drive_t *);
 static ide_startstop_t recal_intr(ide_drive_t *);
@@ -139,8 +120,7 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
 				    WAIT_WORSTCASE, NULL);
 		return ide_started;
 	default:
-		if (task_dma_ok(task) == 0 || drive->using_dma == 0 ||
-		    dma_ops->dma_setup(drive))
+		if (drive->using_dma == 0 || dma_ops->dma_setup(drive))
 			return ide_stopped;
 		dma_ops->dma_exec_cmd(drive, tf->command);
 		dma_ops->dma_start(drive);