aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:33 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:33 -0400
commitc7016e95a556098db6dc4d9096a6189be9e18266 (patch)
tree2bbf6e1de62fe93bf049c8d6a0716fb4f6f43f99
parente295b8d27465a106cd3db150129ab539704e4c65 (diff)
ide: remove no longer needed PC_FLAG_TIMEDOUT packet command flag
There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-atapi.c5
-rw-r--r--include/linux/ide.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 6adc5b4a4406..f44474b0adae 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -336,11 +336,6 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
336 timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD 336 timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD
337 : WAIT_TAPE_CMD; 337 : WAIT_TAPE_CMD;
338 338
339 if (pc->flags & PC_FLAG_TIMEDOUT) {
340 drive->pc_callback(drive, 0);
341 return ide_stopped;
342 }
343
344 /* Clear the interrupt */ 339 /* Clear the interrupt */
345 stat = tp_ops->read_status(hwif); 340 stat = tp_ops->read_status(hwif);
346 341
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 146b07a9b649..8b0ea43884c0 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -350,8 +350,6 @@ enum {
350 PC_FLAG_DMA_IN_PROGRESS = (1 << 4), 350 PC_FLAG_DMA_IN_PROGRESS = (1 << 4),
351 PC_FLAG_DMA_ERROR = (1 << 5), 351 PC_FLAG_DMA_ERROR = (1 << 5),
352 PC_FLAG_WRITING = (1 << 6), 352 PC_FLAG_WRITING = (1 << 6),
353 /* command timed out */
354 PC_FLAG_TIMEDOUT = (1 << 7),
355}; 353};
356 354
357/* 355/*