Commit bb9cdaf2 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[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: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ad9511cb
...@@ -350,27 +350,6 @@ ide_startstop_t task_in_intr (ide_drive_t *drive) ...@@ -350,27 +350,6 @@ ide_startstop_t task_in_intr (ide_drive_t *drive)
return ide_started; 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); pBuf = task_map_rq(rq, &flags);
DTF("Read: %p, rq->current_nr_sectors: %d, stat: %02x\n", 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) ...@@ -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_task_t *args = rq->special;
ide_startstop_t startstop; 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, if (ide_wait_stat(&startstop, drive, DATA_READY,
drive->bad_wstat, WAIT_DRQ)) { drive->bad_wstat, WAIT_DRQ)) {
printk(KERN_ERR "%s: no DRQ after issuing %s\n", printk(KERN_ERR "%s: no DRQ after issuing %s\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment