aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-13 11:47:49 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-13 11:47:49 -0400
commitddf151026a293725507fedc39b18ae6edb86d775 (patch)
tree649de86d3de0bfc686ce92e94a2f46979fc2fbfc /include/linux/ide.h
parent218ee5f364ed006403f1bbe3c1da5af51b1bdb2a (diff)
ide-pmac: use __ide_wait_stat()
* Use __ide_wait_stat() instead of wait_for_ready() in pmac_ide_do_setfeature(). While at it do following changes to match __ide_wait_stat() call in ide_config_drive_speed(): * Wait WAIT_CMD time (20 sec) instead of 2 sec for device to clear BUSY_STAT. * Check DRQ_STAT bit (shouldn't be set for good device status). Also remove no longer needed wait_for_ready() from ide-iops.c. Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3a8cb81bb61d..d86115e9aa2c 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1153,7 +1153,7 @@ extern void SELECT_MASK(ide_drive_t *, int);
1153extern void QUIRK_LIST(ide_drive_t *); 1153extern void QUIRK_LIST(ide_drive_t *);
1154 1154
1155extern int drive_is_ready(ide_drive_t *); 1155extern int drive_is_ready(ide_drive_t *);
1156extern int wait_for_ready(ide_drive_t *, int /* timeout */); 1156int __ide_wait_stat(ide_drive_t *, u8, u8, unsigned long);
1157 1157
1158/* 1158/*
1159 * taskfile io for disks for now...and builds request from ide_ioctl 1159 * taskfile io for disks for now...and builds request from ide_ioctl