ide: ide_dev_has_iordy() -> ata_id_has_iordy()

* Remove (id[ATA_ID_FIELD_VALID] & 2) check from ide_dev_has_iordy()
  (it is for validity of words 64-70, IORDY is in word 49).

* ide_dev_has_iordy() -> ata_id_has_iordy()

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 1 insertions, 6 deletions

diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 61a006cb4746..8cc4e137c608 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -61,7 +61,7 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio)
         if (cmd_off == 0)
                 cmd_off = 1;
 
-        if (pio > 2 || ide_dev_has_iordy(drive->id))
+        if (pio > 2 || ata_id_has_iordy(drive->id))
                 iordy = 0x40;
 
         return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e5622bb5a4a1..27829c13bef7 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1382,11 +1382,6 @@ const char *ide_xfer_verbose(u8 mode);
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
 extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
 
-static inline int ide_dev_has_iordy(u16 *id)
-{
-        return ((id[ATA_ID_FIELD_VALID] & 2) && ata_id_has_iordy(id)) ? 1 : 0;
-}
-
 static inline int ide_dev_is_sata(u16 *id)
 {
         /*