aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index ec5f58c6f19a..d1e834a1c5cd 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -295,7 +295,7 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
295 hwif->OUTB(0, io_ports->feature_addr); 295 hwif->OUTB(0, io_ports->feature_addr);
296 296
297 /* ask drive for ID */ 297 /* ask drive for ID */
298 hwif->OUTBSYNC(hwif, cmd, hwif->io_ports.command_addr); 298 hwif->exec_command(hwif, cmd);
299 299
300 timeout = ((cmd == WIN_IDENTIFY) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2; 300 timeout = ((cmd == WIN_IDENTIFY) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;
301 timeout += jiffies; 301 timeout += jiffies;
@@ -482,7 +482,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
482 msleep(50); 482 msleep(50);
483 SELECT_DRIVE(drive); 483 SELECT_DRIVE(drive);
484 msleep(50); 484 msleep(50);
485 hwif->OUTBSYNC(hwif, WIN_SRST, io_ports->command_addr); 485 hwif->exec_command(hwif, WIN_SRST);
486 (void)ide_busy_sleep(hwif); 486 (void)ide_busy_sleep(hwif);
487 rc = try_to_identify(drive, cmd); 487 rc = try_to_identify(drive, cmd);
488 } 488 }
@@ -518,7 +518,7 @@ static void enable_nest (ide_drive_t *drive)
518 printk("%s: enabling %s -- ", hwif->name, drive->id->model); 518 printk("%s: enabling %s -- ", hwif->name, drive->id->model);
519 SELECT_DRIVE(drive); 519 SELECT_DRIVE(drive);
520 msleep(50); 520 msleep(50);
521 hwif->OUTBSYNC(hwif, EXABYTE_ENABLE_NEST, hwif->io_ports.command_addr); 521 hwif->exec_command(hwif, EXABYTE_ENABLE_NEST);
522 522
523 if (ide_busy_sleep(hwif)) { 523 if (ide_busy_sleep(hwif)) {
524 printk(KERN_CONT "failed (timeout)\n"); 524 printk(KERN_CONT "failed (timeout)\n");