diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index e04eaa49a8bf..ddce28e77a4e 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -212,25 +212,6 @@ static void idefloppy_update_buffers(ide_drive_t *drive, | |||
212 | idefloppy_end_request(drive, 1, 0); | 212 | idefloppy_end_request(drive, 1, 0); |
213 | } | 213 | } |
214 | 214 | ||
215 | /* | ||
216 | * Generate a new packet command request in front of the request queue, before | ||
217 | * the current request so that it will be processed immediately, on the next | ||
218 | * pass through the driver. | ||
219 | */ | ||
220 | static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc, | ||
221 | struct request *rq) | ||
222 | { | ||
223 | struct ide_floppy_obj *floppy = drive->driver_data; | ||
224 | |||
225 | blk_rq_init(NULL, rq); | ||
226 | rq->buffer = (char *) pc; | ||
227 | rq->cmd_type = REQ_TYPE_SPECIAL; | ||
228 | rq->cmd_flags |= REQ_PREEMPT; | ||
229 | rq->rq_disk = floppy->disk; | ||
230 | memcpy(rq->cmd, pc->c, 12); | ||
231 | ide_do_drive_cmd(drive, rq); | ||
232 | } | ||
233 | |||
234 | static void ide_floppy_callback(ide_drive_t *drive) | 215 | static void ide_floppy_callback(ide_drive_t *drive) |
235 | { | 216 | { |
236 | idefloppy_floppy_t *floppy = drive->driver_data; | 217 | idefloppy_floppy_t *floppy = drive->driver_data; |
@@ -288,7 +269,7 @@ static void idefloppy_retry_pc(ide_drive_t *drive) | |||
288 | 269 | ||
289 | (void)ide_read_error(drive); | 270 | (void)ide_read_error(drive); |
290 | idefloppy_create_request_sense_cmd(pc); | 271 | idefloppy_create_request_sense_cmd(pc); |
291 | idefloppy_queue_pc_head(drive, pc, rq); | 272 | ide_queue_pc_head(drive, floppy->disk, pc, rq); |
292 | } | 273 | } |
293 | 274 | ||
294 | /* The usual interrupt handler called during a packet command. */ | 275 | /* The usual interrupt handler called during a packet command. */ |