aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2006-10-03 04:14:25 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 11:04:08 -0400
commit3f63c5e88a5ce45b423f3712293f1664115b09c0 (patch)
treeb735419f00d8054fe16d8aa905d6e46128999050 /drivers/ide/ide-dma.c
parent27ac6036f31dea8117ecc525e0dbfd17b23e8c09 (diff)
[PATCH] ide: remove dma_base2 field from ide_hwif_t
Remove dma_base2 field from ide_hwif_t as it's used only in 2 drivers and without great need. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: John Keller <jpk@sgi.com> Signed-off-by: Jeremy Higdon <jeremy@sgi.com> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 9069766f236e..56efed6742d4 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -799,8 +799,6 @@ static int ide_release_iomio_dma(ide_hwif_t *hwif)
799 release_region(hwif->dma_base, 8); 799 release_region(hwif->dma_base, 8);
800 if (hwif->extra_ports) 800 if (hwif->extra_ports)
801 release_region(hwif->extra_base, hwif->extra_ports); 801 release_region(hwif->extra_base, hwif->extra_ports);
802 if (hwif->dma_base2)
803 release_region(hwif->dma_base, 8);
804 return 1; 802 return 1;
805} 803}
806 804
@@ -872,19 +870,9 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port
872 } 870 }
873 871
874 if(hwif->mate) 872 if(hwif->mate)
875 hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base; 873 hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base:base;
876 else 874 else
877 hwif->dma_master = base; 875 hwif->dma_master = base;
878 if (hwif->dma_base2) {
879 if (!request_region(hwif->dma_base2, ports, hwif->name))
880 {
881 printk(" -- Error, secondary ports in use.\n");
882 release_region(base, ports);
883 if (hwif->extra_ports)
884 release_region(hwif->extra_base, hwif->extra_ports);
885 return 1;
886 }
887 }
888 return 0; 876 return 0;
889} 877}
890 878