Merge branch 'linus' into x86/x2apic

[linux-2.6-omap-h63xx.git] / drivers / ide / legacy / ide-4drives.c

diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index ecd7f3553554e8f9c17da4537fd46818dd9feabe..89c8ff0a4d085f81e89bffba2fc3ba12a89f97c2 100644 (file)
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -4,41 +4,70 @@
 #include <linux/module.h>
 #include <linux/ide.h>
 
-int probe_4drives = 0;
+#define DRV_NAME "ide-4drives"
+
+static int probe_4drives;
 
 module_param_named(probe, probe_4drives, bool, 0);
 MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 
+static void ide_4drives_init_dev(ide_drive_t *drive)
+{
+       if (drive->hwif->channel)
+               drive->select.all ^= 0x20;
+}
+
+static const struct ide_port_ops ide_4drives_port_ops = {
+       .init_dev               = ide_4drives_init_dev,
+};
+
+static const struct ide_port_info ide_4drives_port_info = {
+       .port_ops               = &ide_4drives_port_ops,
+       .host_flags             = IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA,
+};
+
 static int __init ide_4drives_init(void)
 {
        ide_hwif_t *hwif, *mate;
-       u8 idx[4] = { 0, 1, 0xff, 0xff };
+       unsigned long base = 0x1f0, ctl = 0x3f6;
+       u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        hw_regs_t hw;
 
        if (probe_4drives == 0)
                return -ENODEV;
 
-       hwif = &ide_hwifs[0];
-       mate = &ide_hwifs[1];
+       if (!request_region(base, 8, DRV_NAME)) {
+               printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
+                               DRV_NAME, base, base + 7);
+               return -EBUSY;
+       }
+
+       if (!request_region(ctl, 1, DRV_NAME)) {
+               printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",
+                               DRV_NAME, ctl);
+               release_region(base, 8);
+               return -EBUSY;
+       }
 
        memset(&hw, 0, sizeof(hw));
 
-       ide_std_init_ports(&hw, 0x1f0, 0x3f6);
+       ide_std_init_ports(&hw, base, ctl);
        hw.irq = 14;
        hw.chipset = ide_4drives;
 
-       ide_init_port_hw(hwif, &hw);
-       ide_init_port_hw(mate, &hw);
-
-       mate->drives[0].select.all ^= 0x20;
-       mate->drives[1].select.all ^= 0x20;
-
-       hwif->mate = mate;
-       mate->mate = hwif;
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw);
+               idx[0] = hwif->index;
+       }
 
-       hwif->serialized = mate->serialized = 1;
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw);
+               idx[1] = mate->index;
+       }
 
-       ide_device_add(idx, NULL);
+       ide_device_add(idx, &ide_4drives_port_info);
 
        return 0;
 }