diff options
author | Borislav Petkov <bbpetkov@yahoo.de> | 2008-02-02 13:56:37 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 13:56:37 -0500 |
commit | 757ced8983a0b8d1bb353128605cec0f7a6f633e (patch) | |
tree | 399671ccc4ffe28e863b5feb873034a4cf32ca35 /drivers | |
parent | f373bd820dd80ae079537afb9db511b8802bb9f7 (diff) |
ide-floppy: remove unused flag PC_ABORT
This flag was never being set in the code so remove it. By the way, the
code in the second patch was being executed unconditionally, i.e. in case
pc->retries > IDEFLOPPY_MAX_PC_RETRIES is true (actually that is the only case
when the outer if-test passed), !test_bit(PC_ABORT, &pc->flags)
was always true so the comment is now incorrect and has to go.
Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/ide-floppy.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index b56e37d01593..01701ca95204 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -107,7 +107,6 @@ typedef struct idefloppy_packet_command_s { | |||
107 | /* | 107 | /* |
108 | * Packet command flag bits. | 108 | * Packet command flag bits. |
109 | */ | 109 | */ |
110 | #define PC_ABORT 0 /* Set when an error is considered normal - We won't retry */ | ||
111 | #define PC_DMA_RECOMMENDED 2 /* 1 when we prefer to use DMA if possible */ | 110 | #define PC_DMA_RECOMMENDED 2 /* 1 when we prefer to use DMA if possible */ |
112 | #define PC_DMA_IN_PROGRESS 3 /* 1 while DMA in progress */ | 111 | #define PC_DMA_IN_PROGRESS 3 /* 1 while DMA in progress */ |
113 | #define PC_DMA_ERROR 4 /* 1 when encountered problem during DMA */ | 112 | #define PC_DMA_ERROR 4 /* 1 when encountered problem during DMA */ |
@@ -733,18 +732,12 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p | |||
733 | /* Set the current packet command */ | 732 | /* Set the current packet command */ |
734 | floppy->pc = pc; | 733 | floppy->pc = pc; |
735 | 734 | ||
736 | if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES || | 735 | if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES) { |
737 | test_bit(PC_ABORT, &pc->flags)) { | 736 | if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) |
738 | /* | 737 | ide_floppy_report_error(floppy, pc); |
739 | * We will "abort" retrying a packet command in case | 738 | /* Giving up */ |
740 | * a legitimate error code was received. | 739 | pc->error = IDEFLOPPY_ERROR_GENERAL; |
741 | */ | 740 | |
742 | if (!test_bit(PC_ABORT, &pc->flags)) { | ||
743 | if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) | ||
744 | ide_floppy_report_error(floppy, pc); | ||
745 | /* Giving up */ | ||
746 | pc->error = IDEFLOPPY_ERROR_GENERAL; | ||
747 | } | ||
748 | floppy->failed_pc = NULL; | 741 | floppy->failed_pc = NULL; |
749 | pc->callback(drive); | 742 | pc->callback(drive); |
750 | return ide_stopped; | 743 | return ide_stopped; |