Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check

1 files changed, 28 insertions, 0 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index cb79b7a208e1..915da43edee1 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -730,6 +730,34 @@ static inline int ata_id_has_unload(const u16 *id)
         return 0;
 }
 
+static inline int ata_id_form_factor(const u16 *id)
+{
+        u16 val = id[168];
+
+        if (ata_id_major_version(id) < 7 || val == 0 || val == 0xffff)
+                return 0;
+
+        val &= 0xf;
+
+        if (val > 5)
+                return 0;
+
+        return val;
+}
+
+static inline int ata_id_rotation_rate(const u16 *id)
+{
+        u16 val = id[217];
+
+        if (ata_id_major_version(id) < 7 || val == 0 || val == 0xffff)
+                return 0;
+
+        if (val > 1 && val < 0x401)
+                return 0;
+
+        return val;
+}
+
 static inline int ata_id_has_trim(const u16 *id)
 {
         if (ata_id_major_version(id) >= 7 &&