diff options
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
-rw-r--r-- | drivers/ide/pci/ns87415.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 8aaea4ea5549..7f2090fac6cb 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
@@ -166,10 +166,10 @@ static int ns87415_ide_dma_end (ide_drive_t *drive) | |||
166 | /* get dma command mode */ | 166 | /* get dma command mode */ |
167 | dma_cmd = hwif->INB(hwif->dma_command); | 167 | dma_cmd = hwif->INB(hwif->dma_command); |
168 | /* stop DMA */ | 168 | /* stop DMA */ |
169 | hwif->OUTB(dma_cmd & ~1, hwif->dma_command); | 169 | outb(dma_cmd & ~1, hwif->dma_command); |
170 | /* from ERRATA: clear the INTR & ERROR bits */ | 170 | /* from ERRATA: clear the INTR & ERROR bits */ |
171 | dma_cmd = hwif->INB(hwif->dma_command); | 171 | dma_cmd = hwif->INB(hwif->dma_command); |
172 | hwif->OUTB(dma_cmd|6, hwif->dma_command); | 172 | outb(dma_cmd | 6, hwif->dma_command); |
173 | /* and free any DMA resources */ | 173 | /* and free any DMA resources */ |
174 | ide_destroy_dmatable(drive); | 174 | ide_destroy_dmatable(drive); |
175 | /* verify good DMA status */ | 175 | /* verify good DMA status */ |
@@ -243,9 +243,9 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | |||
243 | * to SELECT_DRIVE() properly during first probe_hwif(). | 243 | * to SELECT_DRIVE() properly during first probe_hwif(). |
244 | */ | 244 | */ |
245 | timeout = 10000; | 245 | timeout = 10000; |
246 | hwif->OUTB(12, hwif->io_ports[IDE_CONTROL_OFFSET]); | 246 | outb(12, hwif->io_ports[IDE_CONTROL_OFFSET]); |
247 | udelay(10); | 247 | udelay(10); |
248 | hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]); | 248 | outb(8, hwif->io_ports[IDE_CONTROL_OFFSET]); |
249 | do { | 249 | do { |
250 | udelay(50); | 250 | udelay(50); |
251 | stat = hwif->INB(hwif->io_ports[IDE_STATUS_OFFSET]); | 251 | stat = hwif->INB(hwif->io_ports[IDE_STATUS_OFFSET]); |
@@ -263,7 +263,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | |||
263 | if (!hwif->dma_base) | 263 | if (!hwif->dma_base) |
264 | return; | 264 | return; |
265 | 265 | ||
266 | hwif->OUTB(0x60, hwif->dma_status); | 266 | outb(0x60, hwif->dma_status); |
267 | hwif->dma_setup = &ns87415_ide_dma_setup; | 267 | hwif->dma_setup = &ns87415_ide_dma_setup; |
268 | hwif->ide_dma_check = &ns87415_ide_dma_check; | 268 | hwif->ide_dma_check = &ns87415_ide_dma_check; |
269 | hwif->ide_dma_end = &ns87415_ide_dma_end; | 269 | hwif->ide_dma_end = &ns87415_ide_dma_end; |