diff options
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r-- | drivers/ide/ide-iops.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 95495e4219ff..21647a2eaff9 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -418,7 +418,7 @@ void ide_fix_driveid(u16 *id) | |||
418 | * ide_fixstring() cleans up and (optionally) byte-swaps a text string, | 418 | * ide_fixstring() cleans up and (optionally) byte-swaps a text string, |
419 | * removing leading/trailing blanks and compressing internal blanks. | 419 | * removing leading/trailing blanks and compressing internal blanks. |
420 | * It is primarily used to tidy up the model name/number fields as | 420 | * It is primarily used to tidy up the model name/number fields as |
421 | * returned by the WIN_[P]IDENTIFY commands. | 421 | * returned by the ATA_CMD_ID_ATA[PI] commands. |
422 | */ | 422 | */ |
423 | 423 | ||
424 | void ide_fixstring (u8 *s, const int bytecount, const int byteswap) | 424 | void ide_fixstring (u8 *s, const int bytecount, const int byteswap) |
@@ -675,7 +675,7 @@ int ide_driveid_update(ide_drive_t *drive) | |||
675 | SELECT_MASK(drive, 1); | 675 | SELECT_MASK(drive, 1); |
676 | tp_ops->set_irq(hwif, 0); | 676 | tp_ops->set_irq(hwif, 0); |
677 | msleep(50); | 677 | msleep(50); |
678 | tp_ops->exec_command(hwif, WIN_IDENTIFY); | 678 | tp_ops->exec_command(hwif, ATA_CMD_ID_ATA); |
679 | timeout = jiffies + WAIT_WORSTCASE; | 679 | timeout = jiffies + WAIT_WORSTCASE; |
680 | do { | 680 | do { |
681 | if (time_after(jiffies, timeout)) { | 681 | if (time_after(jiffies, timeout)) { |
@@ -770,7 +770,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) | |||
770 | 770 | ||
771 | tp_ops->tf_load(drive, &task); | 771 | tp_ops->tf_load(drive, &task); |
772 | 772 | ||
773 | tp_ops->exec_command(hwif, WIN_SETFEATURES); | 773 | tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES); |
774 | 774 | ||
775 | if (drive->quirk_list == 2) | 775 | if (drive->quirk_list == 2) |
776 | tp_ops->set_irq(hwif, 1); | 776 | tp_ops->set_irq(hwif, 1); |
@@ -890,7 +890,7 @@ void ide_execute_pkt_cmd(ide_drive_t *drive) | |||
890 | unsigned long flags; | 890 | unsigned long flags; |
891 | 891 | ||
892 | spin_lock_irqsave(&ide_lock, flags); | 892 | spin_lock_irqsave(&ide_lock, flags); |
893 | hwif->tp_ops->exec_command(hwif, WIN_PACKETCMD); | 893 | hwif->tp_ops->exec_command(hwif, ATA_CMD_PACKET); |
894 | ndelay(400); | 894 | ndelay(400); |
895 | spin_unlock_irqrestore(&ide_lock, flags); | 895 | spin_unlock_irqrestore(&ide_lock, flags); |
896 | } | 896 | } |
@@ -1100,7 +1100,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi) | |||
1100 | pre_reset(drive); | 1100 | pre_reset(drive); |
1101 | SELECT_DRIVE(drive); | 1101 | SELECT_DRIVE(drive); |
1102 | udelay (20); | 1102 | udelay (20); |
1103 | tp_ops->exec_command(hwif, WIN_SRST); | 1103 | tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET); |
1104 | ndelay(400); | 1104 | ndelay(400); |
1105 | hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; | 1105 | hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; |
1106 | hwgroup->polling = 1; | 1106 | hwgroup->polling = 1; |