Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=218ee5f364ed006403f1bbe3c1da5af51b1bdb2a
Commit:     218ee5f364ed006403f1bbe3c1da5af51b1bdb2a
Parent:     74af21cf4d0ab67df53608753a443dc7904ec12e
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Sat Oct 13 17:47:49 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Sat Oct 13 17:47:49 2007 +0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 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 ad58c7e..512452b 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to