diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index f9ad4b3021ee..fb235641da33 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -61,9 +61,6 @@ | |||
61 | */ | 61 | */ |
62 | #define IDEFLOPPY_PC_DELAY (HZ/20) /* default delay for ZIP 100 (50ms) */ | 62 | #define IDEFLOPPY_PC_DELAY (HZ/20) /* default delay for ZIP 100 (50ms) */ |
63 | 63 | ||
64 | /* Error code returned in rq->errors to the higher part of the driver. */ | ||
65 | #define IDEFLOPPY_ERROR_GENERAL 101 | ||
66 | |||
67 | /* | 64 | /* |
68 | * Used to finish servicing a request. For read/write requests, we will call | 65 | * Used to finish servicing a request. For read/write requests, we will call |
69 | * ide_end_request to pass to the next buffer. | 66 | * ide_end_request to pass to the next buffer. |
@@ -77,7 +74,7 @@ static int ide_floppy_end_request(ide_drive_t *drive, int uptodate, int nsecs) | |||
77 | 74 | ||
78 | switch (uptodate) { | 75 | switch (uptodate) { |
79 | case 0: | 76 | case 0: |
80 | error = IDEFLOPPY_ERROR_GENERAL; | 77 | error = IDE_DRV_ERROR_GENERAL; |
81 | break; | 78 | break; |
82 | 79 | ||
83 | case 1: | 80 | case 1: |
@@ -183,7 +180,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, | |||
183 | if (!(pc->flags & PC_FLAG_SUPPRESS_ERROR)) | 180 | if (!(pc->flags & PC_FLAG_SUPPRESS_ERROR)) |
184 | ide_floppy_report_error(floppy, pc); | 181 | ide_floppy_report_error(floppy, pc); |
185 | /* Giving up */ | 182 | /* Giving up */ |
186 | pc->error = IDEFLOPPY_ERROR_GENERAL; | 183 | pc->error = IDE_DRV_ERROR_GENERAL; |
187 | 184 | ||
188 | drive->failed_pc = NULL; | 185 | drive->failed_pc = NULL; |
189 | drive->pc_callback(drive, 0); | 186 | drive->pc_callback(drive, 0); |