diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2008-02-01 17:09:30 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:30 -0500 |
commit | ecf32796395ed0e27667e7f735946d6dc60e1765 (patch) | |
tree | 0cafd743bd39148b85470c8fb6398b30dbce7ffd /drivers/ide/pci | |
parent | 4e5a68aeb6b513ee0adda11642e10e528b7721c0 (diff) |
ide: ide_setup_dma() assumes 8 ports
According to http://marc.info/?l=linux-ide&m=114346138611631, the drivers must
always register 8 DMA ports with ide_setup_dma(), so its last argument is not
needed. While at it, kill some useless parens in that function...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/hpt366.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 49aa82e412b6..9dd7cb4d07d4 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -745,7 +745,7 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) | |||
745 | return; | 745 | return; |
746 | if (!hwif->channel) | 746 | if (!hwif->channel) |
747 | outb(inb(dmabase + 2) & 0x60, dmabase + 2); | 747 | outb(inb(dmabase + 2) & 0x60, dmabase + 2); |
748 | ide_setup_dma(hwif, dmabase, 8); | 748 | ide_setup_dma(hwif, dmabase); |
749 | } | 749 | } |
750 | 750 | ||
751 | static const struct ide_port_info ali15x3_chipset __devinitdata = { | 751 | static const struct ide_port_info ali15x3_chipset __devinitdata = { |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 12685939a813..d33a3f9c12b7 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -1413,7 +1413,7 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase) | |||
1413 | 1413 | ||
1414 | local_irq_restore(flags); | 1414 | local_irq_restore(flags); |
1415 | 1415 | ||
1416 | ide_setup_dma(hwif, dmabase, 8); | 1416 | ide_setup_dma(hwif, dmabase); |
1417 | } | 1417 | } |
1418 | 1418 | ||
1419 | static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) | 1419 | static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) |
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 3a1e081fe390..ea66383c5579 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -334,7 +334,7 @@ static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase) | |||
334 | u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0; | 334 | u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0; |
335 | 335 | ||
336 | if (hwif->channel) { | 336 | if (hwif->channel) { |
337 | ide_setup_dma(hwif, dmabase, 8); | 337 | ide_setup_dma(hwif, dmabase); |
338 | return; | 338 | return; |
339 | } | 339 | } |
340 | 340 | ||
@@ -358,7 +358,7 @@ static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase) | |||
358 | } | 358 | } |
359 | #endif /* CONFIG_PDC202XX_BURST */ | 359 | #endif /* CONFIG_PDC202XX_BURST */ |
360 | 360 | ||
361 | ide_setup_dma(hwif, dmabase, 8); | 361 | ide_setup_dma(hwif, dmabase); |
362 | } | 362 | } |
363 | 363 | ||
364 | static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, | 364 | static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, |