Pull ec into release branch

[pandora-kernel.git] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 272736e..6caeb98 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -40,6 +40,7 @@ enum {
        ATA_MAX_DEVICES         = 2,    /* per bus/port */
        ATA_MAX_PRD             = 256,  /* we could make these 256/256 */
        ATA_SECT_SIZE           = 512,
+       ATA_MAX_SECTORS_128     = 128,
        ATA_MAX_SECTORS         = 256,
        ATA_MAX_SECTORS_LBA48   = 65535,/* TODO: 65536? */
 
@@ -282,7 +283,6 @@ struct ata_taskfile {
 };
 
 #define ata_id_is_ata(id)      (((id)[0] & (1 << 15)) == 0)
-#define ata_id_is_sata(id)     ((id)[93] == 0)
 #define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
 #define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
 #define ata_id_hpa_enabled(id) ((id)[85] & (1 << 10))
@@ -324,6 +324,11 @@ static inline unsigned int ata_id_major_version(const u16 *id)
        return mver;
 }
 
+static inline int ata_id_is_sata(const u16 *id)
+{
+       return ata_id_major_version(id) >= 5 && id[93] == 0;
+}
+
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@ -350,7 +355,7 @@ static inline int ata_id_is_cfa(const u16 *id)
 
 static inline int ata_drive_40wire(const u16 *dev_id)
 {
-       if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
+       if (ata_id_is_sata(dev_id))
                return 0;       /* SATA */
        if ((dev_id[93] & 0xE000) == 0x6000)
                return 0;       /* 80 wire */