ide: ide_dev_is_sata() -> ata_id_is_sata()

* Use optimized ATA version check from Sergei in ata_id_is_sata().

* ide_dev_is_sata() -> ata_id_is_sata()

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

2 files changed, 3 insertions, 3 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: