8 files changed, 12 insertions, 12 deletions

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 = {
         .dma_setup              = ali15x3_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .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)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long base      = hwif->dma_base - (hwif->channel * 8);
-        int err                 = __ide_dma_end(drive);
+        int err                 = ide_dma_end(drive);
         u8  irq_mask            = hwif->channel ? MRDMODE_INTR_CH1 :
                                                   MRDMODE_INTR_CH0;
         u8  mrdmode             = inb(base + 1);
@@ -248,7 +248,7 @@ static int cmd64x_dma_end(ide_drive_t *drive)
         u8  irq_mask            = hwif->channel ? ARTTIM23_INTR_CH1 :
                                                   CFR_INTR_CH0;
         u8  irq_stat            = 0;
-        int err                 = __ide_dma_end(drive);
+        int err                 = ide_dma_end(drive);
 
         (void) pci_read_config_byte(dev, irq_reg, &irq_stat);
         /* 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)
                 if (dma_stat & 0x01)
                         hpt370_irq_timeout(drive);
         }
-        return __ide_dma_end(drive);
+        return ide_dma_end(drive);
 }
 
 static void hpt370_dma_timeout(ide_drive_t *drive)
@@ -877,7 +877,7 @@ static int hpt374_dma_end(ide_drive_t *drive)
         pci_read_config_byte(dev, mcr_addr, &mcr);
         if (bwsr & mask)
                 pci_write_config_byte(dev, mcr_addr, mcr | 0x30);
-        return __ide_dma_end(drive);
+        return ide_dma_end(drive);
 }
 
 /**
@@ -1453,7 +1453,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = hpt366_dma_lost_irq,
         .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)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int ret = __ide_dma_end(drive);
+        int ret = ide_dma_end(drive);
         u8 unit = drive->dn & 1;
 
         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)
         }
         if (drive->current_speed > XFER_UDMA_2)
                 pdc_old_disable_66MHz_clock(drive->hwif);
-        return __ide_dma_end(drive);
+        return ide_dma_end(drive);
 }
 
 static int pdc202xx_dma_test_irq(ide_drive_t *drive)
@@ -333,7 +333,7 @@ static const struct ide_dma_ops pdc20246_dma_ops = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = pdc202xx_dma_test_irq,
         .dma_lost_irq           = pdc202xx_dma_lost_irq,
         .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 = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = siimage_dma_test_irq,
         .dma_timeout            = ide_dma_timeout,
         .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)
 
         DBG(("%s(drive:%s)\n", __func__, drive->name));
 
-        ret = __ide_dma_end(drive);
+        ret = ide_dma_end(drive);
 
         pci_write_config_word(dev, reg, drive->drive_data);
 
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 = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = tc86c001_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timeout            = ide_dma_timeout,