ide: remove ideprobe_init()

* Rename ide_device_add() to ide_device_add_all() and make it accept
  'u8 idx[MAX_HWIFS]' instead of 'u8 idx[4]' as an argument.

* Add ide_device_add() wrapper for ide_device_add_all().

* Convert ide_generic_init() to use ide_device_add_all().

* Remove no longer needed ideprobe_init().

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 0f72b98d727f..bb30c29f6ec0 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -14,10 +14,16 @@
 
 static int __init ide_generic_init(void)
 {
+        u8 idx[MAX_HWIFS];
+        int i;
+
         if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
                 ide_get_lock(NULL, NULL); /* for atari only */
 
-        (void)ideprobe_init();
+        for (i = 0; i < MAX_HWIFS; i++)
+                idx[i] = ide_hwifs[i].present ? 0xff : i;
+
+        ide_device_add_all(idx);
 
         if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
                 ide_release_lock();     /* for atari only */