diff options
Diffstat (limited to 'drivers/ide/pci/jmicron.c')
-rw-r--r-- | drivers/ide/pci/jmicron.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c index d379fbaf6743..582b4cae2b53 100644 --- a/drivers/ide/pci/jmicron.c +++ b/drivers/ide/pci/jmicron.c | |||
@@ -85,21 +85,18 @@ static u8 __devinit ata66_jmicron(ide_hwif_t *hwif) | |||
85 | 85 | ||
86 | static void jmicron_set_pio_mode(ide_drive_t *drive, const u8 pio) | 86 | static void jmicron_set_pio_mode(ide_drive_t *drive, const u8 pio) |
87 | { | 87 | { |
88 | ide_config_drive_speed(drive, XFER_PIO_0 + pio); | ||
89 | } | 88 | } |
90 | 89 | ||
91 | /** | 90 | /** |
92 | * jmicron_tune_chipset - set controller timings | 91 | * jmicron_set_dma_mode - set host controller for DMA mode |
93 | * @drive: Drive to set up | 92 | * @drive: drive |
94 | * @speed: speed we want to achieve | 93 | * @mode: DMA mode |
95 | * | 94 | * |
96 | * As the JMicron snoops for timings all we actually need to do is | 95 | * As the JMicron snoops for timings we don't need to do anything here. |
97 | * set the transfer mode on the device. | ||
98 | */ | 96 | */ |
99 | 97 | ||
100 | static int jmicron_tune_chipset(ide_drive_t *drive, const u8 speed) | 98 | static void jmicron_set_dma_mode(ide_drive_t *drive, const u8 mode) |
101 | { | 99 | { |
102 | return ide_config_drive_speed(drive, speed); | ||
103 | } | 100 | } |
104 | 101 | ||
105 | /** | 102 | /** |
@@ -129,8 +126,8 @@ static int jmicron_config_drive_for_dma (ide_drive_t *drive) | |||
129 | 126 | ||
130 | static void __devinit init_hwif_jmicron(ide_hwif_t *hwif) | 127 | static void __devinit init_hwif_jmicron(ide_hwif_t *hwif) |
131 | { | 128 | { |
132 | hwif->speedproc = &jmicron_tune_chipset; | ||
133 | hwif->set_pio_mode = &jmicron_set_pio_mode; | 129 | hwif->set_pio_mode = &jmicron_set_pio_mode; |
130 | hwif->set_dma_mode = &jmicron_set_dma_mode; | ||
134 | 131 | ||
135 | hwif->drives[0].autotune = 1; | 132 | hwif->drives[0].autotune = 1; |
136 | hwif->drives[1].autotune = 1; | 133 | hwif->drives[1].autotune = 1; |