mmc: sdhci: use FIELD_GET for preset value bit masks

commit fa0910107a9fea170b817f31da2a65463e00e80e upstream.

Use the FIELD_GET macro to get access to the register fields.
Delete the shift macros.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Link: https://lore.kernel.org/r/20200312110050.21732-1-yamada.masahiro@socionext.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 560b2996911ac483e766561093ced8d1f38b55c3..a487985c0453744f6a26b27fd63d835f528f6779 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -13,6 +13,7 @@
  *     - JMicron (hardware and technical support)
  */
 
+#include <linux/bitfield.h>
 #include <linux/delay.h>
 #include <linux/highmem.h>
 #include <linux/io.h>
@@ -1266,10 +1267,9 @@ u16 sdhci_calc_clk(struct sdhci_host *host, unsigned int clock,
 
                        clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
                        pre_val = sdhci_get_preset_value(host);
-                       div = (pre_val & SDHCI_PRESET_SDCLK_FREQ_MASK)
-                               >> SDHCI_PRESET_SDCLK_FREQ_SHIFT;
+                       div = FIELD_GET(SDHCI_PRESET_SDCLK_FREQ_MASK, pre_val);
                        if (host->clk_mul &&
-                               (pre_val & SDHCI_PRESET_CLKGEN_SEL_MASK)) {
+                               (pre_val & SDHCI_PRESET_CLKGEN_SEL)) {
                                clk = SDHCI_PROG_CLOCK_MODE;
                                real_div = div + 1;
                                clk_mul = host->clk_mul;
@@ -1720,8 +1720,8 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
                        sdhci_enable_preset_value(host, true);
                        preset = sdhci_get_preset_value(host);
-                       ios->drv_type = (preset & SDHCI_PRESET_DRV_MASK)
-                               >> SDHCI_PRESET_DRV_SHIFT;
+                       ios->drv_type = FIELD_GET(SDHCI_PRESET_DRV_MASK,
+                                                 preset);
                }
 
                /* Re-enable SD Clock */

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 062db5f6ccac3ca6ad45c69637dd01c3074042c1..00d921eba964d74f951b0d80823b66ee581fbdff 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -13,6 +13,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>
@@ -244,12 +245,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