Skip to content

Commit

Permalink
ide-pmac: fix drive->init_speed reporting
Browse files Browse the repository at this point in the history
pmac_ide_tune_chipset() don't set drive->init_speed.

Fix it by setting drive->{current,init}_speed in pmac_ide_do_setfeature()
and clean up pmac_ide_{tune_chipset,mdma_enable,udma_enable}().

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Aug 20, 2007
1 parent 1116fae commit 59785c8
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions drivers/ide/ppc/pmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,9 @@ pmac_ide_do_setfeature(ide_drive_t *drive, u8 command)
drive->id->dma_1word |= 0x0101; break;
default: break;
}
if (!drive->init_speed)
drive->init_speed = command;
drive->current_speed = command;
}
enable_irq(hwif->irq);
return result;
Expand Down Expand Up @@ -986,7 +989,6 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed)
return ret;

pmac_ide_do_update_timings(drive);
drive->current_speed = speed;

return 0;
}
Expand Down Expand Up @@ -1737,11 +1739,6 @@ pmac_ide_mdma_enable(ide_drive_t *drive, u16 mode)
/* Apply timings to controller */
*timings = timing_local[0];
*timings2 = timing_local[1];

/* Set speed info in drive */
drive->current_speed = mode;
if (!drive->init_speed)
drive->init_speed = mode;

return 1;
}
Expand Down Expand Up @@ -1793,11 +1790,6 @@ pmac_ide_udma_enable(ide_drive_t *drive, u16 mode)
*timings = timing_local[0];
*timings2 = timing_local[1];

/* Set speed info in drive */
drive->current_speed = mode;
if (!drive->init_speed)
drive->init_speed = mode;

return 1;
}

Expand Down

0 comments on commit 59785c8

Please sign in to comment.