diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-13 17:47:49 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-13 17:47:49 +0200 |
| commit | 218ee5f364ed006403f1bbe3c1da5af51b1bdb2a (patch) | |
| tree | bf8c780d22dfa9f26545896b2cc59e588676e75c /drivers/ide/ppc | |
| parent | 74af21cf4d0ab67df53608753a443dc7904ec12e (diff) | |
ide-pmac: remove extra good status wait from pmac_ide_do_setfeature()
Don't check for good device status before executing the command in
pmac_ide_do_setfeature() (ide_config_drive_speed() doesn't do this).
It is a job of upper layers to guarantee that the device is ready to
accept new command before we get here.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index ad58c7ecf85..512452b379b 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -548,16 +548,6 @@ pmac_ide_do_setfeature(ide_drive_t *drive, u8 command) SELECT_DRIVE(drive); SELECT_MASK(drive, 0); udelay(1); - /* Get rid of pending error state */ - (void) hwif->INB(IDE_STATUS_REG); - /* Timeout bumped for some powerbooks */ - if (wait_for_ready(drive, 2000)) { - /* Timeout bumped for some powerbooks */ - printk(KERN_ERR "%s: pmac_ide_do_setfeature disk not ready " - "before SET_FEATURE!\n", drive->name); - goto out; - } - udelay(10); hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG); hwif->OUTB(command, IDE_NSECTOR_REG); hwif->OUTB(SETFEATURES_XFER, IDE_FEATURE_REG); @@ -569,7 +559,7 @@ pmac_ide_do_setfeature(ide_drive_t *drive, u8 command) if (result) printk(KERN_ERR "%s: pmac_ide_do_setfeature disk not ready " "after SET_FEATURE !\n", drive->name); -out: + SELECT_MASK(drive, 0); if (result == 0) { drive->id->dma_ultra &= ~0xFF00; |