diff options
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
-rw-r--r-- | drivers/ide/pci/ns87415.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 332de832f171..5a6dec0e1f4d 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
@@ -150,7 +150,7 @@ static void ns87415_selectproc (ide_drive_t *drive) | |||
150 | ns87415_prepare_drive (drive, drive->using_dma); | 150 | ns87415_prepare_drive (drive, drive->using_dma); |
151 | } | 151 | } |
152 | 152 | ||
153 | static int ns87415_ide_dma_end (ide_drive_t *drive) | 153 | static int ns87415_dma_end(ide_drive_t *drive) |
154 | { | 154 | { |
155 | ide_hwif_t *hwif = HWIF(drive); | 155 | ide_hwif_t *hwif = HWIF(drive); |
156 | u8 dma_stat = 0, dma_cmd = 0; | 156 | u8 dma_stat = 0, dma_cmd = 0; |
@@ -170,7 +170,7 @@ static int ns87415_ide_dma_end (ide_drive_t *drive) | |||
170 | return (dma_stat & 7) != 4; | 170 | return (dma_stat & 7) != 4; |
171 | } | 171 | } |
172 | 172 | ||
173 | static int ns87415_ide_dma_setup(ide_drive_t *drive) | 173 | static int ns87415_dma_setup(ide_drive_t *drive) |
174 | { | 174 | { |
175 | /* select DMA xfer */ | 175 | /* select DMA xfer */ |
176 | ns87415_prepare_drive(drive, 1); | 176 | ns87415_prepare_drive(drive, 1); |
@@ -252,14 +252,17 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | |||
252 | return; | 252 | return; |
253 | 253 | ||
254 | outb(0x60, hwif->dma_status); | 254 | outb(0x60, hwif->dma_status); |
255 | hwif->dma_setup = &ns87415_ide_dma_setup; | ||
256 | hwif->ide_dma_end = &ns87415_ide_dma_end; | ||
257 | } | 255 | } |
258 | 256 | ||
259 | static const struct ide_port_ops ns87415_port_ops = { | 257 | static const struct ide_port_ops ns87415_port_ops = { |
260 | .selectproc = ns87415_selectproc, | 258 | .selectproc = ns87415_selectproc, |
261 | }; | 259 | }; |
262 | 260 | ||
261 | static struct ide_dma_ops ns87415_dma_ops = { | ||
262 | .dma_setup = ns87415_dma_setup, | ||
263 | .dma_end = ns87415_dma_end, | ||
264 | }; | ||
265 | |||
263 | static const struct ide_port_info ns87415_chipset __devinitdata = { | 266 | static const struct ide_port_info ns87415_chipset __devinitdata = { |
264 | .name = "NS87415", | 267 | .name = "NS87415", |
265 | #ifdef CONFIG_SUPERIO | 268 | #ifdef CONFIG_SUPERIO |
@@ -267,6 +270,7 @@ static const struct ide_port_info ns87415_chipset __devinitdata = { | |||
267 | #endif | 270 | #endif |
268 | .init_hwif = init_hwif_ns87415, | 271 | .init_hwif = init_hwif_ns87415, |
269 | .port_ops = &ns87415_port_ops, | 272 | .port_ops = &ns87415_port_ops, |
273 | .dma_ops = &ns87415_dma_ops, | ||
270 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | | 274 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | |
271 | IDE_HFLAG_NO_ATAPI_DMA, | 275 | IDE_HFLAG_NO_ATAPI_DMA, |
272 | }; | 276 | }; |