diff options
Diffstat (limited to 'drivers/ide/mips/au1xxx-ide.c')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index b04db9ff1938..670cb748481f 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -99,18 +99,12 @@ void auide_outsw(unsigned long port, void *addr, u32 count) | |||
99 | 99 | ||
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | static void auide_tune_drive(ide_drive_t *drive, byte pio) | 102 | static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio) |
103 | { | 103 | { |
104 | int mem_sttime; | 104 | int mem_sttime; |
105 | int mem_stcfg; | 105 | int mem_stcfg; |
106 | u8 speed; | 106 | u8 speed; |
107 | 107 | ||
108 | /* get the best pio mode for the drive */ | ||
109 | pio = ide_get_best_pio_mode(drive, pio, 4); | ||
110 | |||
111 | printk(KERN_INFO "%s: setting Au1XXX IDE to PIO mode%d\n", | ||
112 | drive->name, pio); | ||
113 | |||
114 | mem_sttime = 0; | 108 | mem_sttime = 0; |
115 | mem_stcfg = au_readl(MEM_STCFG2); | 109 | mem_stcfg = au_readl(MEM_STCFG2); |
116 | 110 | ||
@@ -184,7 +178,7 @@ static int auide_tune_chipset(ide_drive_t *drive, const u8 speed) | |||
184 | mem_stcfg = au_readl(MEM_STCFG2); | 178 | mem_stcfg = au_readl(MEM_STCFG2); |
185 | 179 | ||
186 | if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { | 180 | if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { |
187 | auide_tune_drive(drive, speed - XFER_PIO_0); | 181 | au1xxx_set_pio_mode(drive, speed - XFER_PIO_0); |
188 | return 0; | 182 | return 0; |
189 | } | 183 | } |
190 | 184 | ||
@@ -712,7 +706,7 @@ static int au_ide_probe(struct device *dev) | |||
712 | hwif->OUTSW = auide_outsw; | 706 | hwif->OUTSW = auide_outsw; |
713 | #endif | 707 | #endif |
714 | 708 | ||
715 | hwif->tuneproc = &auide_tune_drive; | 709 | hwif->set_pio_mode = &au1xxx_set_pio_mode; |
716 | hwif->speedproc = &auide_tune_chipset; | 710 | hwif->speedproc = &auide_tune_chipset; |
717 | 711 | ||
718 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 712 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |