[PATCH v4 04/38] mmc: dw_mmc: Extract FIFO init into a separate routine

[Sam Protsenko]

Move FIFO threshold initialization into a separate function to make
dwmci_init() more readable.

No functional change.

Signed-off-by: Sam Protsenko <semen.protse...@linaro.org>
Reviewed-by: Quentin Schulz <quentin.sch...@cherry.de>
---
Changes in v4:
  - (none)

Changes in v3:
  - (none)

Changes in v2:
  - Added R-b tag from Quentin

 drivers/mmc/dw_mmc.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 395b699b0a0a..4a9e57165fbb 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -538,6 +538,20 @@ static int dwmci_set_ios(struct mmc *mmc)
        return 0;
 }
 
+static void dwmci_init_fifo(struct dwmci_host *host)
+{
+       if (!host->fifoth_val) {
+               u32 fifo_size;
+
+               fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
+               fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
+               host->fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
+                                  TX_WMARK(fifo_size / 2);
+       }
+
+       dwmci_writel(host, DWMCI_FIFOTH, host->fifoth_val);
+}
+
 static int dwmci_init(struct mmc *mmc)
 {
        struct dwmci_host *host = mmc->priv;
@@ -562,16 +576,7 @@ static int dwmci_init(struct mmc *mmc)
 
        dwmci_writel(host, DWMCI_IDINTEN, 0);
        dwmci_writel(host, DWMCI_BMOD, 1);
-
-       if (!host->fifoth_val) {
-               uint32_t fifo_size;
-
-               fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
-               fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
-               host->fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
-                               TX_WMARK(fifo_size / 2);
-       }
-       dwmci_writel(host, DWMCI_FIFOTH, host->fifoth_val);
+       dwmci_init_fifo(host);
 
        dwmci_writel(host, DWMCI_CLKENA, 0);
        dwmci_writel(host, DWMCI_CLKSRC, 0);
-- 
2.39.2