diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-dma.c | 7 | ||||
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/cmd64x.c | 4 | ||||
-rw-r--r-- | drivers/ide/pci/hpt366.c | 6 | ||||
-rw-r--r-- | drivers/ide/pci/it821x.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 4 | ||||
-rw-r--r-- | drivers/ide/pci/siimage.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/sl82c105.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/tc86c001.c | 2 |
9 files changed, 15 insertions, 16 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index d5934fc8f85f..f142d8f1349e 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -531,7 +531,7 @@ void ide_dma_start(ide_drive_t *drive) | |||
531 | EXPORT_SYMBOL_GPL(ide_dma_start); | 531 | EXPORT_SYMBOL_GPL(ide_dma_start); |
532 | 532 | ||
533 | /* returns 1 on error, 0 otherwise */ | 533 | /* returns 1 on error, 0 otherwise */ |
534 | int __ide_dma_end (ide_drive_t *drive) | 534 | int ide_dma_end(ide_drive_t *drive) |
535 | { | 535 | { |
536 | ide_hwif_t *hwif = drive->hwif; | 536 | ide_hwif_t *hwif = drive->hwif; |
537 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; | 537 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; |
@@ -566,8 +566,7 @@ int __ide_dma_end (ide_drive_t *drive) | |||
566 | wmb(); | 566 | wmb(); |
567 | return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; | 567 | return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; |
568 | } | 568 | } |
569 | 569 | EXPORT_SYMBOL_GPL(ide_dma_end); | |
570 | EXPORT_SYMBOL(__ide_dma_end); | ||
571 | 570 | ||
572 | /* returns 1 if dma irq issued, 0 otherwise */ | 571 | /* returns 1 if dma irq issued, 0 otherwise */ |
573 | int ide_dma_test_irq(ide_drive_t *drive) | 572 | int ide_dma_test_irq(ide_drive_t *drive) |
@@ -880,7 +879,7 @@ const struct ide_dma_ops sff_dma_ops = { | |||
880 | .dma_setup = ide_dma_setup, | 879 | .dma_setup = ide_dma_setup, |
881 | .dma_exec_cmd = ide_dma_exec_cmd, | 880 | .dma_exec_cmd = ide_dma_exec_cmd, |
882 | .dma_start = ide_dma_start, | 881 | .dma_start = ide_dma_start, |
883 | .dma_end = __ide_dma_end, | 882 | .dma_end = ide_dma_end, |
884 | .dma_test_irq = ide_dma_test_irq, | 883 | .dma_test_irq = ide_dma_test_irq, |
885 | .dma_timeout = ide_dma_timeout, | 884 | .dma_timeout = ide_dma_timeout, |
886 | .dma_lost_irq = ide_dma_lost_irq, | 885 | .dma_lost_irq = ide_dma_lost_irq, |
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 9d017fc1895e..daf9dce39e52 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -507,7 +507,7 @@ static const struct ide_dma_ops ali_dma_ops = { | |||
507 | .dma_setup = ali15x3_dma_setup, | 507 | .dma_setup = ali15x3_dma_setup, |
508 | .dma_exec_cmd = ide_dma_exec_cmd, | 508 | .dma_exec_cmd = ide_dma_exec_cmd, |
509 | .dma_start = ide_dma_start, | 509 | .dma_start = ide_dma_start, |
510 | .dma_end = __ide_dma_end, | 510 | .dma_end = ide_dma_end, |
511 | .dma_test_irq = ide_dma_test_irq, | 511 | .dma_test_irq = ide_dma_test_irq, |
512 | .dma_lost_irq = ide_dma_lost_irq, | 512 | .dma_lost_irq = ide_dma_lost_irq, |
513 | .dma_timeout = ide_dma_timeout, | 513 | .dma_timeout = ide_dma_timeout, |
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index bb89c505074c..935385c77e06 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -228,7 +228,7 @@ static int cmd648_dma_end(ide_drive_t *drive) | |||
228 | { | 228 | { |
229 | ide_hwif_t *hwif = HWIF(drive); | 229 | ide_hwif_t *hwif = HWIF(drive); |
230 | unsigned long base = hwif->dma_base - (hwif->channel * 8); | 230 | unsigned long base = hwif->dma_base - (hwif->channel * 8); |
231 | int err = __ide_dma_end(drive); | 231 | int err = ide_dma_end(drive); |
232 | u8 irq_mask = hwif->channel ? MRDMODE_INTR_CH1 : | 232 | u8 irq_mask = hwif->channel ? MRDMODE_INTR_CH1 : |
233 | MRDMODE_INTR_CH0; | 233 | MRDMODE_INTR_CH0; |
234 | u8 mrdmode = inb(base + 1); | 234 | u8 mrdmode = inb(base + 1); |
@@ -248,7 +248,7 @@ static int cmd64x_dma_end(ide_drive_t *drive) | |||
248 | u8 irq_mask = hwif->channel ? ARTTIM23_INTR_CH1 : | 248 | u8 irq_mask = hwif->channel ? ARTTIM23_INTR_CH1 : |
249 | CFR_INTR_CH0; | 249 | CFR_INTR_CH0; |
250 | u8 irq_stat = 0; | 250 | u8 irq_stat = 0; |
251 | int err = __ide_dma_end(drive); | 251 | int err = ide_dma_end(drive); |
252 | 252 | ||
253 | (void) pci_read_config_byte(dev, irq_reg, &irq_stat); | 253 | (void) pci_read_config_byte(dev, irq_reg, &irq_stat); |
254 | /* clear the interrupt bit */ | 254 | /* clear the interrupt bit */ |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 91f51e7b376f..9cf171cb9376 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -835,7 +835,7 @@ static int hpt370_dma_end(ide_drive_t *drive) | |||
835 | if (dma_stat & 0x01) | 835 | if (dma_stat & 0x01) |
836 | hpt370_irq_timeout(drive); | 836 | hpt370_irq_timeout(drive); |
837 | } | 837 | } |
838 | return __ide_dma_end(drive); | 838 | return ide_dma_end(drive); |
839 | } | 839 | } |
840 | 840 | ||
841 | static void hpt370_dma_timeout(ide_drive_t *drive) | 841 | static void hpt370_dma_timeout(ide_drive_t *drive) |
@@ -877,7 +877,7 @@ static int hpt374_dma_end(ide_drive_t *drive) | |||
877 | pci_read_config_byte(dev, mcr_addr, &mcr); | 877 | pci_read_config_byte(dev, mcr_addr, &mcr); |
878 | if (bwsr & mask) | 878 | if (bwsr & mask) |
879 | pci_write_config_byte(dev, mcr_addr, mcr | 0x30); | 879 | pci_write_config_byte(dev, mcr_addr, mcr | 0x30); |
880 | return __ide_dma_end(drive); | 880 | return ide_dma_end(drive); |
881 | } | 881 | } |
882 | 882 | ||
883 | /** | 883 | /** |
@@ -1453,7 +1453,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = { | |||
1453 | .dma_setup = ide_dma_setup, | 1453 | .dma_setup = ide_dma_setup, |
1454 | .dma_exec_cmd = ide_dma_exec_cmd, | 1454 | .dma_exec_cmd = ide_dma_exec_cmd, |
1455 | .dma_start = ide_dma_start, | 1455 | .dma_start = ide_dma_start, |
1456 | .dma_end = __ide_dma_end, | 1456 | .dma_end = ide_dma_end, |
1457 | .dma_test_irq = ide_dma_test_irq, | 1457 | .dma_test_irq = ide_dma_test_irq, |
1458 | .dma_lost_irq = hpt366_dma_lost_irq, | 1458 | .dma_lost_irq = hpt366_dma_lost_irq, |
1459 | .dma_timeout = ide_dma_timeout, | 1459 | .dma_timeout = ide_dma_timeout, |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index ae7e7420f198..995e18bb3139 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -385,7 +385,7 @@ static int it821x_dma_end(ide_drive_t *drive) | |||
385 | { | 385 | { |
386 | ide_hwif_t *hwif = drive->hwif; | 386 | ide_hwif_t *hwif = drive->hwif; |
387 | struct it821x_dev *itdev = ide_get_hwifdata(hwif); | 387 | struct it821x_dev *itdev = ide_get_hwifdata(hwif); |
388 | int ret = __ide_dma_end(drive); | 388 | int ret = ide_dma_end(drive); |
389 | u8 unit = drive->dn & 1; | 389 | u8 unit = drive->dn & 1; |
390 | 390 | ||
391 | if(itdev->mwdma[unit] != MWDMA_OFF) | 391 | if(itdev->mwdma[unit] != MWDMA_OFF) |
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 649b807c6aa6..799557c25eef 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -200,7 +200,7 @@ static int pdc202xx_dma_end(ide_drive_t *drive) | |||
200 | } | 200 | } |
201 | if (drive->current_speed > XFER_UDMA_2) | 201 | if (drive->current_speed > XFER_UDMA_2) |
202 | pdc_old_disable_66MHz_clock(drive->hwif); | 202 | pdc_old_disable_66MHz_clock(drive->hwif); |
203 | return __ide_dma_end(drive); | 203 | return ide_dma_end(drive); |
204 | } | 204 | } |
205 | 205 | ||
206 | static int pdc202xx_dma_test_irq(ide_drive_t *drive) | 206 | static int pdc202xx_dma_test_irq(ide_drive_t *drive) |
@@ -333,7 +333,7 @@ static const struct ide_dma_ops pdc20246_dma_ops = { | |||
333 | .dma_setup = ide_dma_setup, | 333 | .dma_setup = ide_dma_setup, |
334 | .dma_exec_cmd = ide_dma_exec_cmd, | 334 | .dma_exec_cmd = ide_dma_exec_cmd, |
335 | .dma_start = ide_dma_start, | 335 | .dma_start = ide_dma_start, |
336 | .dma_end = __ide_dma_end, | 336 | .dma_end = ide_dma_end, |
337 | .dma_test_irq = pdc202xx_dma_test_irq, | 337 | .dma_test_irq = pdc202xx_dma_test_irq, |
338 | .dma_lost_irq = pdc202xx_dma_lost_irq, | 338 | .dma_lost_irq = pdc202xx_dma_lost_irq, |
339 | .dma_timeout = pdc202xx_dma_timeout, | 339 | .dma_timeout = pdc202xx_dma_timeout, |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 0652e31119ef..eb4faf92c571 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -713,7 +713,7 @@ static const struct ide_dma_ops sil_dma_ops = { | |||
713 | .dma_setup = ide_dma_setup, | 713 | .dma_setup = ide_dma_setup, |
714 | .dma_exec_cmd = ide_dma_exec_cmd, | 714 | .dma_exec_cmd = ide_dma_exec_cmd, |
715 | .dma_start = ide_dma_start, | 715 | .dma_start = ide_dma_start, |
716 | .dma_end = __ide_dma_end, | 716 | .dma_end = ide_dma_end, |
717 | .dma_test_irq = siimage_dma_test_irq, | 717 | .dma_test_irq = siimage_dma_test_irq, |
718 | .dma_timeout = ide_dma_timeout, | 718 | .dma_timeout = ide_dma_timeout, |
719 | .dma_lost_irq = ide_dma_lost_irq, | 719 | .dma_lost_irq = ide_dma_lost_irq, |
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 4399e76aa081..84dc33602ff8 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -207,7 +207,7 @@ static int sl82c105_dma_end(ide_drive_t *drive) | |||
207 | 207 | ||
208 | DBG(("%s(drive:%s)\n", __func__, drive->name)); | 208 | DBG(("%s(drive:%s)\n", __func__, drive->name)); |
209 | 209 | ||
210 | ret = __ide_dma_end(drive); | 210 | ret = ide_dma_end(drive); |
211 | 211 | ||
212 | pci_write_config_word(dev, reg, drive->drive_data); | 212 | pci_write_config_word(dev, reg, drive->drive_data); |
213 | 213 | ||
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c index a683377d75f1..93e2cce4b296 100644 --- a/drivers/ide/pci/tc86c001.c +++ b/drivers/ide/pci/tc86c001.c | |||
@@ -186,7 +186,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = { | |||
186 | .dma_setup = ide_dma_setup, | 186 | .dma_setup = ide_dma_setup, |
187 | .dma_exec_cmd = ide_dma_exec_cmd, | 187 | .dma_exec_cmd = ide_dma_exec_cmd, |
188 | .dma_start = tc86c001_dma_start, | 188 | .dma_start = tc86c001_dma_start, |
189 | .dma_end = __ide_dma_end, | 189 | .dma_end = ide_dma_end, |
190 | .dma_test_irq = ide_dma_test_irq, | 190 | .dma_test_irq = ide_dma_test_irq, |
191 | .dma_lost_irq = ide_dma_lost_irq, | 191 | .dma_lost_irq = ide_dma_lost_irq, |
192 | .dma_timeout = ide_dma_timeout, | 192 | .dma_timeout = ide_dma_timeout, |