diff options
Diffstat (limited to 'drivers/ata/pata_ninja32.c')
-rw-r--r-- | drivers/ata/pata_ninja32.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c index 04acd3f86120..1c1b83541d13 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c | |||
@@ -61,7 +61,8 @@ static void ninja32_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
61 | static u16 pio_timing[5] = { | 61 | static u16 pio_timing[5] = { |
62 | 0xd6, 0x85, 0x44, 0x33, 0x13 | 62 | 0xd6, 0x85, 0x44, 0x33, 0x13 |
63 | }; | 63 | }; |
64 | iowrite8(pio_timing[adev->pio_mode - XFER_PIO_0], ap->ioaddr.bmdma_addr + 0x1f); | 64 | iowrite8(pio_timing[adev->pio_mode - XFER_PIO_0], |
65 | ap->ioaddr.bmdma_addr + 0x1f); | ||
65 | ap->private_data = adev; | 66 | ap->private_data = adev; |
66 | } | 67 | } |
67 | 68 | ||
@@ -176,12 +177,13 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
176 | iowrite8(0xB3, base + 0x02); /* Burst, ?? setup */ | 177 | iowrite8(0xB3, base + 0x02); /* Burst, ?? setup */ |
177 | iowrite8(0x00, base + 0x04); /* WAIT0 ? */ | 178 | iowrite8(0x00, base + 0x04); /* WAIT0 ? */ |
178 | /* FIXME: Should we disable them at remove ? */ | 179 | /* FIXME: Should we disable them at remove ? */ |
179 | return ata_host_activate(host, dev->irq, ata_interrupt, IRQF_SHARED, &ninja32_sht); | 180 | return ata_host_activate(host, dev->irq, ata_interrupt, |
181 | IRQF_SHARED, &ninja32_sht); | ||
180 | } | 182 | } |
181 | 183 | ||
182 | static const struct pci_device_id ninja32[] = { | 184 | static const struct pci_device_id ninja32[] = { |
183 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 185 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
184 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 186 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
185 | { }, | 187 | { }, |
186 | }; | 188 | }; |
187 | 189 | ||