diff options
Diffstat (limited to 'drivers/ata/pata_ns87415.c')
-rw-r--r-- | drivers/ata/pata_ns87415.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c index bb97ef583f9b..b9a17eb100d0 100644 --- a/drivers/ata/pata_ns87415.c +++ b/drivers/ata/pata_ns87415.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * TODO: | 17 | * TODO: |
18 | * Test PARISC SuperIO | 18 | * Test PARISC SuperIO |
19 | * Get someone to test on SPARC | 19 | * Get someone to test on SPARC |
20 | * Implement lazy pio/dma switching for better performance | 20 | * Implement lazy pio/dma switching for better performance |
21 | * 8bit shared timing. | 21 | * 8bit shared timing. |
22 | * See if we need to kill the FIFO for ATAPI | 22 | * See if we need to kill the FIFO for ATAPI |
23 | */ | 23 | */ |
@@ -60,10 +60,10 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mo | |||
60 | u16 clocking; | 60 | u16 clocking; |
61 | u8 iordy; | 61 | u8 iordy; |
62 | u8 status; | 62 | u8 status; |
63 | 63 | ||
64 | /* Timing register format is 17 - low nybble read timing with | 64 | /* Timing register format is 17 - low nybble read timing with |
65 | the high nybble being 16 - x for recovery time in PCI clocks */ | 65 | the high nybble being 16 - x for recovery time in PCI clocks */ |
66 | 66 | ||
67 | ata_timing_compute(adev, adev->pio_mode, &t, T, 0); | 67 | ata_timing_compute(adev, adev->pio_mode, &t, T, 0); |
68 | 68 | ||
69 | clocking = 17 - FIT(t.active, 2, 17); | 69 | clocking = 17 - FIT(t.active, 2, 17); |
@@ -71,7 +71,7 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mo | |||
71 | /* Use the same timing for read and write bytes */ | 71 | /* Use the same timing for read and write bytes */ |
72 | clocking |= (clocking << 8); | 72 | clocking |= (clocking << 8); |
73 | pci_write_config_word(dev, timing, clocking); | 73 | pci_write_config_word(dev, timing, clocking); |
74 | 74 | ||
75 | /* Set the IORDY enable versus DMA enable on or off properly */ | 75 | /* Set the IORDY enable versus DMA enable on or off properly */ |
76 | pci_read_config_byte(dev, 0x42, &iordy); | 76 | pci_read_config_byte(dev, 0x42, &iordy); |
77 | iordy &= ~(1 << (4 + unit)); | 77 | iordy &= ~(1 << (4 + unit)); |
@@ -185,7 +185,7 @@ static void ns87415_bmdma_irq_clear(struct ata_port *ap) | |||
185 | 185 | ||
186 | if (!mmio) | 186 | if (!mmio) |
187 | return; | 187 | return; |
188 | iowrite8((ioread8(mmio + ATA_DMA_CMD) | ATA_DMA_INTR | ATA_DMA_ERR), | 188 | iowrite8((ioread8(mmio + ATA_DMA_CMD) | ATA_DMA_INTR | ATA_DMA_ERR), |
189 | mmio + ATA_DMA_CMD); | 189 | mmio + ATA_DMA_CMD); |
190 | } | 190 | } |
191 | 191 | ||