[PATCH 4/4] mci: sdhci: reduce duplication in sdhci_wait_idle[_data]

[Ahmad Fatoum]

Now that the two functions look nearly identical, let's factor out the
common parts into a helper function and keep only the differences.

In future, we may export only a single function once the implications
are better understood, but even now, it's already a win for readability.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 drivers/mci/sdhci.c | 42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index f0c95f2dbfa8..2d32a8b31188 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -821,17 +821,12 @@ void sdhci_enable_clk(struct sdhci *host, u16 clk)
 	sdhci_write16(host, SDHCI_CLOCK_CONTROL, clk);
 }
 
-int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *data)
+static int __sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd,
+			     struct mci_data *data, u32 mask)
 {
-	u32 mask;
 	ktime_t timeout_ns;
 	int ret;
 
-	mask = SDHCI_CMD_INHIBIT_CMD;
-
-	if (data || (cmd && (cmd->resp_type & MMC_RSP_BUSY)))
-		mask |= SDHCI_CMD_INHIBIT_DATA;
-
 	if (cmd && (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION ||
 		    mmc_op_tuning(cmd->cmdidx)))
 		mask &= ~SDHCI_CMD_INHIBIT_DATA;
@@ -849,30 +844,21 @@ int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *da
 	return 0;
 }
 
+int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *data)
+{
+	u32 mask = SDHCI_CMD_INHIBIT_CMD;
+
+	if (data || (cmd && (cmd->resp_type & MMC_RSP_BUSY)))
+		mask |= SDHCI_CMD_INHIBIT_DATA;
+
+	return __sdhci_wait_idle(host, cmd, data, mask);
+}
+
 int sdhci_wait_idle_data(struct sdhci *host, struct mci_cmd *cmd)
 {
-	u32 mask;
-	ktime_t timeout_ns;
-	int ret;
+	u32 mask = SDHCI_CMD_INHIBIT_CMD | SDHCI_CMD_INHIBIT_DATA;
 
-	mask = SDHCI_CMD_INHIBIT_CMD | SDHCI_CMD_INHIBIT_DATA;
-
-	if (cmd && (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION ||
-		    mmc_op_tuning(cmd->cmdidx)))
-		mask &= ~SDHCI_CMD_INHIBIT_DATA;
-
-	timeout_ns = sdhci_compute_timeout(cmd, NULL);
-
-	ret = wait_on_timeout(timeout_ns,
-			!(sdhci_read32(host, SDHCI_PRESENT_STATE) & mask));
-
-	if (ret) {
-		dev_err(sdhci_dev(host),
-				"SDHCI timeout while waiting for idle\n");
-		return -EBUSY;
-	}
-
-	return 0;
+	return __sdhci_wait_idle(host, cmd, NULL, mask);
 }
 
 void sdhci_set_clock(struct sdhci *host, unsigned int clock, unsigned int input_clock)
-- 
2.39.5