Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index 6e2c58c5f6a2f8ff5e6304f83fd1d3f009c53c2d..d2862e638bc516c30f38efb8b58d180cb5c829e0 100644 (file)
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -110,7 +110,7 @@ static void tune_umc (ide_drive_t *drive, u8 pio)
        unsigned long flags;
        ide_hwgroup_t *hwgroup = ide_hwifs[HWIF(drive)->index^1].hwgroup;
 
-       pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+       pio = ide_get_best_pio_mode(drive, pio, 4);
        printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
                drive->name, pio, pio_to_umc[pio]);
        spin_lock_irqsave(&ide_lock, flags);
@@ -149,10 +149,12 @@ static int __init umc8672_probe(void)
        mate = &ide_hwifs[1];
 
        hwif->chipset = ide_umc8672;
+       hwif->pio_mask = ATA_PIO4;
        hwif->tuneproc = &tune_umc;
        hwif->mate = mate;
 
        mate->chipset = ide_umc8672;
+       mate->pio_mask = ATA_PIO4;
        mate->tuneproc = &tune_umc;
        mate->mate = hwif;
        mate->channel = 1;
@@ -160,17 +162,27 @@ static int __init umc8672_probe(void)
        probe_hwif_init(hwif);
        probe_hwif_init(mate);
 
-       create_proc_ide_interfaces();
+       ide_proc_register_port(hwif);
+       ide_proc_register_port(mate);
 
        return 0;
 }
 
+int probe_umc8672 = 0;
+
+module_param_named(probe, probe_umc8672, bool, 0);
+MODULE_PARM_DESC(probe, "probe for UMC8672 chipset");
+
 /* Can be called directly from ide.c. */
 int __init umc8672_init(void)
 {
-       if (umc8672_probe())
-               return -ENODEV;
-       return 0;
+       if (probe_umc8672 == 0)
+               goto out;
+
+       if (umc8672_probe() == 0)
+               return 0;;
+out:
+       return -ENODEV;;
 }
 
 #ifdef MODULE