1 files changed, 20 insertions, 7 deletions

diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 4a49b5c59acb..4f6d0191cf6c 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -84,11 +84,12 @@ static inline void hwif_setup(ide_hwif_t *hwif)
         hwif->INSL  = NULL;
 }
 
-void __init h8300_ide_init(void)
+static int __init h8300_ide_init(void)
 {
         hw_regs_t hw;
         ide_hwif_t *hwif;
-        int idx;
+        int index;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         if (!request_region(CONFIG_H8300_IDE_BASE, H8300_IDE_GAP*8, "ide-h8300"))
                 goto out_busy;
@@ -100,16 +101,28 @@ void __init h8300_ide_init(void)
         hw_setup(&hw);
 
         /* register if */
-        idx = ide_register_hw(&hw, NULL, 1, &hwif);
-        if (idx == -1) {
+        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        if (hwif == NULL) {
                 printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");
-                return;
+                return -ENOENT;
         }
 
+        index = hwif->index;
+        ide_init_port_data(hwif, index);
+        ide_init_port_hw(hwif, &hw);
         hwif_setup(hwif);
-        printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", idx);
-        return;
+        printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", index);
+
+        idx[0] = index;
+
+        ide_device_add(idx);
+
+        return 0;
 
 out_busy:
         printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n");
+
+        return -EBUSY;
 }
+
+module_init(h8300_ide_init);