diff options
Diffstat (limited to 'drivers/ide/pci/hpt366.c')
-rw-r--r-- | drivers/ide/pci/hpt366.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 5030bda1adeb..8c02961d0188 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -1347,7 +1347,7 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif, | |||
1347 | if (ide_allocate_dma_engine(hwif)) | 1347 | if (ide_allocate_dma_engine(hwif)) |
1348 | return -1; | 1348 | return -1; |
1349 | 1349 | ||
1350 | ide_setup_dma(hwif, base, d); | 1350 | ide_setup_dma(hwif, base); |
1351 | 1351 | ||
1352 | return 0; | 1352 | return 0; |
1353 | } | 1353 | } |
@@ -1415,19 +1415,37 @@ static const struct ide_port_ops hpt3xx_port_ops = { | |||
1415 | .cable_detect = hpt3xx_cable_detect, | 1415 | .cable_detect = hpt3xx_cable_detect, |
1416 | }; | 1416 | }; |
1417 | 1417 | ||
1418 | static struct ide_dma_ops hpt37x_dma_ops = { | 1418 | static const struct ide_dma_ops hpt37x_dma_ops = { |
1419 | .dma_host_set = ide_dma_host_set, | ||
1420 | .dma_setup = ide_dma_setup, | ||
1421 | .dma_exec_cmd = ide_dma_exec_cmd, | ||
1422 | .dma_start = ide_dma_start, | ||
1419 | .dma_end = hpt374_dma_end, | 1423 | .dma_end = hpt374_dma_end, |
1420 | .dma_test_irq = hpt374_dma_test_irq, | 1424 | .dma_test_irq = hpt374_dma_test_irq, |
1425 | .dma_lost_irq = ide_dma_lost_irq, | ||
1426 | .dma_timeout = ide_dma_timeout, | ||
1421 | }; | 1427 | }; |
1422 | 1428 | ||
1423 | static struct ide_dma_ops hpt370_dma_ops = { | 1429 | static const struct ide_dma_ops hpt370_dma_ops = { |
1430 | .dma_host_set = ide_dma_host_set, | ||
1431 | .dma_setup = ide_dma_setup, | ||
1432 | .dma_exec_cmd = ide_dma_exec_cmd, | ||
1424 | .dma_start = hpt370_dma_start, | 1433 | .dma_start = hpt370_dma_start, |
1425 | .dma_end = hpt370_dma_end, | 1434 | .dma_end = hpt370_dma_end, |
1435 | .dma_test_irq = ide_dma_test_irq, | ||
1436 | .dma_lost_irq = ide_dma_lost_irq, | ||
1426 | .dma_timeout = hpt370_dma_timeout, | 1437 | .dma_timeout = hpt370_dma_timeout, |
1427 | }; | 1438 | }; |
1428 | 1439 | ||
1429 | static struct ide_dma_ops hpt36x_dma_ops = { | 1440 | static const struct ide_dma_ops hpt36x_dma_ops = { |
1441 | .dma_host_set = ide_dma_host_set, | ||
1442 | .dma_setup = ide_dma_setup, | ||
1443 | .dma_exec_cmd = ide_dma_exec_cmd, | ||
1444 | .dma_start = ide_dma_start, | ||
1445 | .dma_end = __ide_dma_end, | ||
1446 | .dma_test_irq = ide_dma_test_irq, | ||
1430 | .dma_lost_irq = hpt366_dma_lost_irq, | 1447 | .dma_lost_irq = hpt366_dma_lost_irq, |
1448 | .dma_timeout = ide_dma_timeout, | ||
1431 | }; | 1449 | }; |
1432 | 1450 | ||
1433 | static const struct ide_port_info hpt366_chipsets[] __devinitdata = { | 1451 | static const struct ide_port_info hpt366_chipsets[] __devinitdata = { |