4 files changed, 12 insertions, 17 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 6256c2df62cc..0a2fd3b37ac4 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -630,7 +630,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
                 printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
                                   drive->name);
 
-        if (ide_dev_is_sata(id) && !ivb)
+        if (ata_id_is_sata(id) && !ivb)
                 return 1;
 
         if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index d706eb6b8acd..9056e3acc78b 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -654,7 +654,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
         case HPT372A:
         case HPT372N:
         case HPT374 :
-                if (ide_dev_is_sata(drive->id))
+                if (ata_id_is_sata(drive->id))
                         mask &= ~0x0e;
                 /* Fall thru */
         default:
@@ -674,7 +674,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
         case HPT372A:
         case HPT372N:
         case HPT374 :
-                if (ide_dev_is_sata(drive->id))
+                if (ata_id_is_sata(drive->id))
                         return 0x00;
                 /* Fall thru */
         default:
diff --git a/include/linux/ata.h b/include/linux/ata.h
index be00973d1a8c..d28aad991c75 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -645,7 +645,15 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 
 static inline int ata_id_is_sata(const u16 *id)
 {
-        return ata_id_major_version(id) >= 5 && id[ATA_ID_HW_CONFIG] == 0;
+        /*
+         * See if word 93 is 0 AND drive is at least ATA-5 compatible
+         * verifying that word 80 by casting it to a signed type --
+         * this trick allows us to filter out the reserved values of
+         * 0x0000 and 0xffff along with the earlier ATA revisions...
+         */
+        if (id[ATA_ID_HW_CONFIG] == 0 && (short)id[ATA_ID_MAJOR_VER] >= 0x0020)
+                return 1;
+        return 0;
 }
 
 static inline int ata_id_has_tpm(const u16 *id)
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 27829c13bef7..87b5b5d39539 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1382,19 +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_is_sata(u16 *id)
-{
-        /*
-         * See if word 93 is 0 AND drive is at least ATA-5 compatible
-         * verifying that word 80 by casting it to a signed type --
-         * this trick allows us to filter out the reserved values of
-         * 0x0000 and 0xffff along with the earlier ATA revisions...
-         */
-        if (id[ATA_ID_HW_CONFIG] == 0 && (short)id[ATA_ID_MAJOR_VER] >= 0x0020)
-                return 1;
-        return 0;
-}
-
 u64 ide_get_lba_addr(struct ide_taskfile *, int);
 u8 ide_dump_status(ide_drive_t *, const char *, u8);