diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index f8fe6ee128f3..faf22d716f80 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -465,7 +465,7 @@ static void idefloppy_retry_pc(ide_drive_t *drive) | |||
465 | idefloppy_pc_t *pc; | 465 | idefloppy_pc_t *pc; |
466 | struct request *rq; | 466 | struct request *rq; |
467 | 467 | ||
468 | (void)drive->hwif->INB(IDE_ERROR_REG); | 468 | (void)ide_read_error(drive); |
469 | pc = idefloppy_next_pc_storage(drive); | 469 | pc = idefloppy_next_pc_storage(drive); |
470 | rq = idefloppy_next_rq_storage(drive); | 470 | rq = idefloppy_next_rq_storage(drive); |
471 | idefloppy_create_request_sense_cmd(pc); | 471 | idefloppy_create_request_sense_cmd(pc); |
@@ -501,7 +501,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) | |||
501 | } | 501 | } |
502 | 502 | ||
503 | /* Clear the interrupt */ | 503 | /* Clear the interrupt */ |
504 | stat = drive->hwif->INB(IDE_STATUS_REG); | 504 | stat = ide_read_status(drive); |
505 | 505 | ||
506 | /* No more interrupts */ | 506 | /* No more interrupts */ |
507 | if ((stat & DRQ_STAT) == 0) { | 507 | if ((stat & DRQ_STAT) == 0) { |
@@ -1246,7 +1246,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg) | |||
1246 | u8 stat; | 1246 | u8 stat; |
1247 | 1247 | ||
1248 | local_irq_save(flags); | 1248 | local_irq_save(flags); |
1249 | stat = drive->hwif->INB(IDE_STATUS_REG); | 1249 | stat = ide_read_status(drive); |
1250 | local_irq_restore(flags); | 1250 | local_irq_restore(flags); |
1251 | 1251 | ||
1252 | progress_indication = ((stat & SEEK_STAT) == 0) ? 0 : 0x10000; | 1252 | progress_indication = ((stat & SEEK_STAT) == 0) ? 0 : 0x10000; |