diff options
Diffstat (limited to 'drivers/ide/sc1200.c')
-rw-r--r-- | drivers/ide/sc1200.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c index d467478d68d..134f1fd1386 100644 --- a/drivers/ide/sc1200.c +++ b/drivers/ide/sc1200.c | |||
@@ -122,13 +122,13 @@ out: | |||
122 | return mask; | 122 | return mask; |
123 | } | 123 | } |
124 | 124 | ||
125 | static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode) | 125 | static void sc1200_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
126 | { | 126 | { |
127 | ide_hwif_t *hwif = drive->hwif; | ||
128 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 127 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
129 | unsigned int reg, timings; | 128 | unsigned int reg, timings; |
130 | unsigned short pci_clock; | 129 | unsigned short pci_clock; |
131 | unsigned int basereg = hwif->channel ? 0x50 : 0x40; | 130 | unsigned int basereg = hwif->channel ? 0x50 : 0x40; |
131 | const u8 mode = drive->dma_mode; | ||
132 | 132 | ||
133 | static const u32 udma_timing[3][3] = { | 133 | static const u32 udma_timing[3][3] = { |
134 | { 0x00921250, 0x00911140, 0x00911030 }, | 134 | { 0x00921250, 0x00911140, 0x00911030 }, |
@@ -193,10 +193,10 @@ static int sc1200_dma_end(ide_drive_t *drive) | |||
193 | * will have valid default PIO timings set up before we get here. | 193 | * will have valid default PIO timings set up before we get here. |
194 | */ | 194 | */ |
195 | 195 | ||
196 | static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio) | 196 | static void sc1200_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
197 | { | 197 | { |
198 | ide_hwif_t *hwif = drive->hwif; | ||
199 | int mode = -1; | 198 | int mode = -1; |
199 | const u8 pio = drive->pio_mode - XFER_PIO_0; | ||
200 | 200 | ||
201 | /* | 201 | /* |
202 | * bad abuse of ->set_pio_mode interface | 202 | * bad abuse of ->set_pio_mode interface |