aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2009-03-31 14:15:30 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:30 -0400
commitecf3a31d2a08a419bdf919456f1724f5b72bde2c (patch)
tree11a5b4685425541fa4bb267ac6f897cb1c38ba41 /drivers/ide/ide-iops.c
parent4d74c3fcf2b90487eacec511bc8c07177711c81c (diff)
ide: turn set_irq() method into write_devctl() method
Turn set_irq() method with its software reset hack into write_devctl() method (for just writing a value into the device control register) at last... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 0caca342802d..ae227dd8466f 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -360,7 +360,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
360 SELECT_DRIVE(drive); 360 SELECT_DRIVE(drive);
361 SELECT_MASK(drive, 1); 361 SELECT_MASK(drive, 1);
362 udelay(1); 362 udelay(1);
363 tp_ops->set_irq(hwif, 0); 363 tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
364 364
365 memset(&cmd, 0, sizeof(cmd)); 365 memset(&cmd, 0, sizeof(cmd));
366 cmd.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT; 366 cmd.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT;
@@ -372,7 +372,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
372 tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES); 372 tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES);
373 373
374 if (drive->quirk_list == 2) 374 if (drive->quirk_list == 2)
375 tp_ops->set_irq(hwif, 1); 375 tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
376 376
377 error = __ide_wait_stat(drive, drive->ready_stat, 377 error = __ide_wait_stat(drive, drive->ready_stat,
378 ATA_BUSY | ATA_DRQ | ATA_ERR, 378 ATA_BUSY | ATA_DRQ | ATA_ERR,