6 files changed, 5 insertions, 31 deletions

diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index 161d30c8481..a22da7ab2b5 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -41,7 +41,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
         hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
         hw.irq = irq;
 
-        hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
         if (hwif == NULL)
                 goto out;
 
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index 8e1f6bd3388..0a722503c10 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -378,7 +378,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
         hw.irq = irq->start;
         hw.chipset = ide_palm3710;
 
-        hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
         if (hwif == NULL)
                 goto out;
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 67ce697a9d5..bd5ff7d987d 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -618,31 +618,6 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
 }
 EXPORT_SYMBOL_GPL(ide_init_port_hw);
 
-ide_hwif_t *ide_deprecated_find_port(unsigned long base)
-{
-        ide_hwif_t *hwif;
-        int i;
-
-        for (i = 0; i < MAX_HWIFS; i++) {
-                hwif = &ide_hwifs[i];
-                if (hwif->io_ports[IDE_DATA_OFFSET] == base)
-                        goto found;
-        }
-
-        for (i = 0; i < MAX_HWIFS; i++) {
-                hwif = &ide_hwifs[i];
-                if (hwif->hold)
-                        continue;
-                if (!hwif->present && hwif->mate == NULL)
-                        goto found;
-        }
-
-        hwif = NULL;
-found:
-        return hwif;
-}
-EXPORT_SYMBOL_GPL(ide_deprecated_find_port);
-
 /**
  *      ide_register_hw         -       register IDE interface
  *      @hw: hardware registers
@@ -662,7 +637,7 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         do {
-                hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]);
+                hwif = ide_find_port(hw->io_ports[IDE_DATA_OFFSET]);
                 if (hwif)
                         goto found;
                 for (index = 0; index < MAX_HWIFS; index++)
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 15ccf6944ae..de2e5944809 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -156,7 +156,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
     hw.chipset = ide_pci;
     hw.dev = &handle->dev;
 
-    hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+    hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
     if (hwif == NULL)
         return -1;
 
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 3f9cd64c26a..e08e13a0bb6 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -78,7 +78,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         hw.irq = dev->irq;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-        hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
         if (hwif == NULL)
                 goto out_disable;
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 43d2968a4e1..1b423958a89 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -186,7 +186,6 @@ typedef struct hw_regs_s {
 } hw_regs_t;
 
 struct hwif_s * ide_find_port(unsigned long);
-struct hwif_s *ide_deprecated_find_port(unsigned long);
 void ide_init_port_data(struct hwif_s *, unsigned int);
 void ide_init_port_hw(struct hwif_s *, hw_regs_t *);