[PATCH] ide: remove dead code from ide-taskfile.c

Remove dead code from task_in_intr() and pre_task_mulout_intr()
(CONFIG_IDE_TASKFILE_IO=n versions).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index c684ad5da8bb83a7773c6c640c1f3c7ba349ca62..2a74a338c54b8f88d5c8672c277ec406e14b3044 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -350,27 +350,6 @@ ide_startstop_t task_in_intr (ide_drive_t *drive)
                        return ide_started;  
                }
        }
-#if 0
-
-       /*
-        * Holding point for a brain dump of a thought :-/
-        */
-
-       if (!OK_STAT(stat,DRIVE_READY,drive->bad_wstat)) {
-               DTF("%s: READ attempting to recover last " \
-                       "sector counter status=0x%02x\n",
-                       drive->name, stat);
-               rq->current_nr_sectors++;
-               return DRIVER(drive)->error(drive, "task_in_intr", stat);
-        }
-       if (!rq->current_nr_sectors)
-               if (!DRIVER(drive)->end_request(drive, 1, 0))
-                       return ide_stopped;
-
-       if (--rq->current_nr_sectors <= 0)
-               if (!DRIVER(drive)->end_request(drive, 1, 0))
-                       return ide_stopped;
-#endif
 
        pBuf = task_map_rq(rq, &flags);
        DTF("Read: %p, rq->current_nr_sectors: %d, stat: %02x\n",
@@ -547,13 +526,6 @@ ide_startstop_t pre_task_mulout_intr (ide_drive_t *drive, struct request *rq)
        ide_task_t *args = rq->special;
        ide_startstop_t startstop;
 
-#if 0
-       /*
-        * assign private copy for multi-write
-        */
-       memcpy(&HWGROUP(drive)->wrq, rq, sizeof(struct request));
-#endif
-
        if (ide_wait_stat(&startstop, drive, DATA_READY,
                        drive->bad_wstat, WAIT_DRQ)) {
                printk(KERN_ERR "%s: no DRQ after issuing %s\n",