mmc: sdhci: use FIELD_GET for preset value bit masks

[sfrench/cifs-2.6.git] / drivers / mmc / host / sdhci.h

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 851b81565f4683280758f3b4b8b3d4450b372ab8..79dffbb731d3349095733ab418722566df4b7a79 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -9,6 +9,7 @@
 #ifndef __SDHCI_HW_H
 #define __SDHCI_HW_H
 
+#include <linux/bits.h>
 #include <linux/scatterlist.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
@@ -267,12 +268,9 @@
 #define SDHCI_PRESET_FOR_SDR104        0x6C
 #define SDHCI_PRESET_FOR_DDR50 0x6E
 #define SDHCI_PRESET_FOR_HS400 0x74 /* Non-standard */
-#define SDHCI_PRESET_DRV_MASK  0xC000
-#define SDHCI_PRESET_DRV_SHIFT  14
-#define SDHCI_PRESET_CLKGEN_SEL_MASK   0x400
-#define SDHCI_PRESET_CLKGEN_SEL_SHIFT  10
-#define SDHCI_PRESET_SDCLK_FREQ_MASK   0x3FF
-#define SDHCI_PRESET_SDCLK_FREQ_SHIFT  0
+#define SDHCI_PRESET_DRV_MASK          GENMASK(15, 14)
+#define SDHCI_PRESET_CLKGEN_SEL                BIT(10)
+#define SDHCI_PRESET_SDCLK_FREQ_MASK   GENMASK(9, 0)
 
 #define SDHCI_SLOT_INT_STATUS  0xFC