git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
it821x.c
diff --git
a/drivers/ide/it821x.c
b/drivers/ide/it821x.c
index
69becb7
..
b2709c7
100644
(file)
--- a/
drivers/ide/it821x.c
+++ b/
drivers/ide/it821x.c
@@
-252,7
+252,7
@@
static void it821x_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
* on the cable.
*/
if (pair) {
* on the cable.
*/
if (pair) {
- u8 pair_pio =
ide_get_best_pio_mode(pair, 255, 4)
;
+ u8 pair_pio =
pair->pio_mode - XFER_PIO_0
;
/* trim PIO to the slowest of the master/slave */
if (pair_pio < set_pio)
set_pio = pair_pio;
/* trim PIO to the slowest of the master/slave */
if (pair_pio < set_pio)
set_pio = pair_pio;
@@
-393,14
+393,16
@@
static int it821x_dma_end(ide_drive_t *drive)
/**
* it821x_set_dma_mode - set host controller for DMA mode
/**
* it821x_set_dma_mode - set host controller for DMA mode
+ * @hwif: port
* @drive: drive
* @drive: drive
- * @speed: DMA mode
*
* Tune the ITE chipset for the desired DMA mode.
*/
*
* Tune the ITE chipset for the desired DMA mode.
*/
-static void it821x_set_dma_mode(ide_
drive_t *drive, const u8 speed
)
+static void it821x_set_dma_mode(ide_
hwif_t *hwif, ide_drive_t *drive
)
{
{
+ const u8 speed = drive->dma_mode;
+
/*
* MWDMA tuning is really hard because our MWDMA and PIO
* timings are kept in the same place. We can switch in the
/*
* MWDMA tuning is really hard because our MWDMA and PIO
* timings are kept in the same place. We can switch in the