ChangeSet 1.2224.1.120, 2005/04/02 15:28:52+02:00, [EMAIL PROTECTED](none)
[ide] drive->nice1 fix
It is drive's property independent of the driver being used so move
drive->nice1 setup from ide_register_subdriver() to probe_hwif() in
ide-probe.c. As a result changing a driver which controls the drive
no longer affects this flag.
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
ide-probe.c | 11 ++++++++---
ide.c | 1 -
2 files changed, 8 insertions(+), 4 deletions(-)
diff -Nru a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
--- a/drivers/ide/ide-probe.c 2005-04-03 21:23:43 -07:00
+++ b/drivers/ide/ide-probe.c 2005-04-03 21:23:43 -07:00
@@ -862,6 +862,13 @@
drive->autotune == IDE_TUNE_AUTO)
/* auto-tune PIO mode */
hwif->tuneproc(drive, 255);
+
+ if (drive->autotune != IDE_TUNE_DEFAULT &&
+ drive->autotune != IDE_TUNE_AUTO)
+ continue;
+
+ drive->nice1 = 1;
+
/*
* MAJOR HACK BARF :-/
*
@@ -871,9 +878,7 @@
* Move here to prevent module loading clashing.
*/
// drive->autodma = hwif->autodma;
- if ((hwif->ide_dma_check) &&
- ((drive->autotune == IDE_TUNE_DEFAULT) ||
- (drive->autotune == IDE_TUNE_AUTO))) {
+ if (hwif->ide_dma_check) {
/*
* Force DMAing for the beginning of the check.
* Some chipsets appear to do interesting
diff -Nru a/drivers/ide/ide.c b/drivers/ide/ide.c
--- a/drivers/ide/ide.c 2005-04-03 21:23:43 -07:00
+++ b/drivers/ide/ide.c 2005-04-03 21:23:43 -07:00
@@ -2038,7 +2038,6 @@
(drive->autotune == IDE_TUNE_AUTO)) {
/* DMA timings and setup moved to ide-probe.c */
drive->dsc_overlap = (drive->next != drive &&
driver->supports_dsc_overlap);
- drive->nice1 = 1;
}
#ifdef CONFIG_PROC_FS
if (drive->driver != &idedefault_driver)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
