Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / ide / legacy / umc8672.c

diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index ca7974455578005242b4ec79bdcbffae174835c7..79577b916874d085fa96dbf2c2036301e129ef11 100644 (file)
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -105,12 +105,11 @@ static void umc_set_speeds (u8 speeds[])
                speeds[0], speeds[1], speeds[2], speeds[3]);
 }
 
-static void tune_umc (ide_drive_t *drive, u8 pio)
+static void umc_set_pio_mode(ide_drive_t *drive, const 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);
        printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
                drive->name, pio, pio_to_umc[pio]);
        spin_lock_irqsave(&ide_lock, flags);
@@ -125,8 +124,9 @@ static void tune_umc (ide_drive_t *drive, u8 pio)
 
 static int __init umc8672_probe(void)
 {
-       unsigned long flags;
        ide_hwif_t *hwif, *mate;
+       unsigned long flags;
+       static u8 idx[4] = { 0, 1, 0xff, 0xff };
 
        if (!request_region(0x108, 2, "umc8672")) {
                printk(KERN_ERR "umc8672: ports 0x108-0x109 already in use.\n");
@@ -149,18 +149,17 @@ static int __init umc8672_probe(void)
        mate = &ide_hwifs[1];
 
        hwif->chipset = ide_umc8672;
-       hwif->tuneproc = &tune_umc;
+       hwif->pio_mask = ATA_PIO4;
+       hwif->set_pio_mode = &umc_set_pio_mode;
        hwif->mate = mate;
 
        mate->chipset = ide_umc8672;
-       mate->tuneproc = &tune_umc;
+       mate->pio_mask = ATA_PIO4;
+       mate->set_pio_mode = &umc_set_pio_mode;
        mate->mate = hwif;
        mate->channel = 1;
 
-       probe_hwif_init(hwif);
-       probe_hwif_init(mate);
-
-       create_proc_ide_interfaces();
+       ide_device_add(idx);
 
        return 0;
 }