2 files changed, 13 insertions, 8 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 3af33fbf1f88..6298932c0589 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -500,6 +500,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
         ide_hwif_t *hwif;
         void __iomem *base;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
@@ -523,9 +524,9 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         state->hwif[0] = hwif;
 
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
 
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
 
         return 0;
 }
@@ -537,6 +538,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         void __iomem *ioc_base, *easi_base;
         unsigned int sel = 0;
         int ret;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!ioc_base) {
@@ -608,11 +610,10 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
                 icside_dma_init(mate);
         }
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
+        idx[0] = hwif->index;
+        idx[1] = mate->index;
 
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 83811af11610..6d2fe21cd729 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -58,6 +58,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
         ide_hwif_t *hwif;
         void __iomem *base;
         int ret;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         ret = ecard_request_resources(ec);
         if (ret)
@@ -74,8 +75,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                 hwif->hwif_data = base;
                 hwif->gendev.parent = &ec->dev;
                 hwif->noprobe = 0;
-                probe_hwif_init(hwif);
-                ide_proc_register_port(hwif);
+
+                idx[0] = hwif->index;
+
+                ide_device_add(idx);
+
                 ecard_set_drvdata(ec, hwif);
                 goto out;
         }