ide: add ide-4drives host driver (take 3)

CONFIG_BLK_DEV_4DRIVES deserves its own host driver:

* Add drivers/ide/legacy/ide-4drives.c and move "4drives" support there.

* Add ide-4drives.o in the link order after all other legacy host
  drivers enabled by "ide0=" options (they all are mutually exclusive).

* Make ide-4drives host driver probe itself for IDE devices instead of
  indirectly depending on ide_generic host driver.

* Add "probe" module parameter to ide-4drives and update documentation.

v2:
* s/paramater/parameter/ in ide.txt. (Noticed by Randy Dunlap)

v3:
* s/ide_4drives.probe/ide-4drives.probe/ in help entry.
  (Noticed by Sergei Shtylyov)

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

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index adecf45a0849..690b5ff4d88f 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -976,6 +976,7 @@ extern int probe_dtc2278;
 extern int probe_ht6560b;
 extern int probe_qd65xx;
 extern int cmd640_vlb;
+extern int probe_4drives;
 
 static int __initdata is_chipset_set;
 
@@ -1187,19 +1188,9 @@ static int __init ide_setup(char *s)
 #endif
 #ifdef CONFIG_BLK_DEV_4DRIVES
                         case -11: /* "four" drives on one set of ports */
-                        {
-                                ide_hwif_t *mate = &ide_hwifs[hw^1];
-                                mate->drives[0].select.all ^= 0x20;
-                                mate->drives[1].select.all ^= 0x20;
-                                hwif->chipset = mate->chipset = ide_4drives;
-                                mate->irq = hwif->irq;
-                                memcpy(mate->io_ports, hwif->io_ports, sizeof(hwif->io_ports));
-                                hwif->mate = mate;
-                                mate->mate = hwif;
-                                hwif->serialized = mate->serialized = 1;
+                                probe_4drives = 1;
                                 goto obsolete_option;
-                        }
-#endif /* CONFIG_BLK_DEV_4DRIVES */
+#endif
                         case -10: /* minus10 */
                         case -9: /* minus9 */
                         case -8: /* minus8 */