aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/cs5520.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/cs5520.c')
-rw-r--r--drivers/ide/pci/cs5520.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 17d35ca61351..4fb43206621a 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -106,18 +106,6 @@ static void cs5520_set_dma_mode(ide_drive_t *drive, const u8 speed)
106} 106}
107 107
108/* 108/*
109 * We provide a callback for our nonstandard DMA location
110 */
111
112static void __devinit cs5520_init_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
113{
114 unsigned long bmide = pci_resource_start(dev, 2); /* Not the usual 4 */
115 if(hwif->mate && hwif->mate->dma_base) /* Second channel at primary + 8 */
116 bmide += 8;
117 ide_setup_dma(hwif, bmide, 8);
118}
119
120/*
121 * We wrap the DMA activate to set the vdma flag. This is needed 109 * We wrap the DMA activate to set the vdma flag. This is needed
122 * so that the IDE DMA layer issues PIO not DMA commands over the 110 * so that the IDE DMA layer issues PIO not DMA commands over the
123 * DMA channel 111 * DMA channel
@@ -150,9 +138,9 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
150#define DECLARE_CS_DEV(name_str) \ 138#define DECLARE_CS_DEV(name_str) \
151 { \ 139 { \
152 .name = name_str, \ 140 .name = name_str, \
153 .init_setup_dma = cs5520_init_setup_dma, \
154 .init_hwif = init_hwif_cs5520, \ 141 .init_hwif = init_hwif_cs5520, \
155 .host_flags = IDE_HFLAG_ISA_PORTS | \ 142 .host_flags = IDE_HFLAG_ISA_PORTS | \
143 IDE_HFLAG_CS5520 | \
156 IDE_HFLAG_VDMA | \ 144 IDE_HFLAG_VDMA | \
157 IDE_HFLAG_NO_ATAPI_DMA | \ 145 IDE_HFLAG_NO_ATAPI_DMA | \
158 IDE_HFLAG_BOOTABLE, \ 146 IDE_HFLAG_BOOTABLE, \