diff options
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r-- | drivers/ide/ide-iops.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index fb524cf175d5..f7e976c0c2f3 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -473,35 +473,6 @@ int drive_is_ready (ide_drive_t *drive) | |||
473 | EXPORT_SYMBOL(drive_is_ready); | 473 | EXPORT_SYMBOL(drive_is_ready); |
474 | 474 | ||
475 | /* | 475 | /* |
476 | * Global for All, and taken from ide-pmac.c. Can be called | ||
477 | * with spinlock held & IRQs disabled, so don't schedule ! | ||
478 | */ | ||
479 | int wait_for_ready (ide_drive_t *drive, int timeout) | ||
480 | { | ||
481 | ide_hwif_t *hwif = HWIF(drive); | ||
482 | u8 stat = 0; | ||
483 | |||
484 | while(--timeout) { | ||
485 | stat = hwif->INB(IDE_STATUS_REG); | ||
486 | if (!(stat & BUSY_STAT)) { | ||
487 | if (drive->ready_stat == 0) | ||
488 | break; | ||
489 | else if ((stat & drive->ready_stat)||(stat & ERR_STAT)) | ||
490 | break; | ||
491 | } | ||
492 | mdelay(1); | ||
493 | } | ||
494 | if ((stat & ERR_STAT) || timeout <= 0) { | ||
495 | if (stat & ERR_STAT) { | ||
496 | printk(KERN_ERR "%s: wait_for_ready, " | ||
497 | "error status: %x\n", drive->name, stat); | ||
498 | } | ||
499 | return 1; | ||
500 | } | ||
501 | return 0; | ||
502 | } | ||
503 | |||
504 | /* | ||
505 | * This routine busy-waits for the drive status to be not "busy". | 476 | * This routine busy-waits for the drive status to be not "busy". |
506 | * It then checks the status for all of the "good" bits and none | 477 | * It then checks the status for all of the "good" bits and none |
507 | * of the "bad" bits, and if all is okay it returns 0. All other | 478 | * of the "bad" bits, and if all is okay it returns 0. All other |
@@ -512,7 +483,7 @@ int wait_for_ready (ide_drive_t *drive, int timeout) | |||
512 | * setting a timer to wake up at half second intervals thereafter, | 483 | * setting a timer to wake up at half second intervals thereafter, |
513 | * until timeout is achieved, before timing out. | 484 | * until timeout is achieved, before timing out. |
514 | */ | 485 | */ |
515 | static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long timeout, u8 *rstat) | 486 | int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long timeout, u8 *rstat) |
516 | { | 487 | { |
517 | ide_hwif_t *hwif = drive->hwif; | 488 | ide_hwif_t *hwif = drive->hwif; |
518 | unsigned long flags; | 489 | unsigned long flags; |