[PATCH v2 3/8] mmc: dw_mmc: replace the bus_hz checking point

[Jaehoon Chung]

It's right that check immediately whether host->bus_hz is assigned or not.
If drv_data->setup_clock is presented, then host->bus_hz should be set at there.
When setup_clock didn't present, assigned to value with clk_get_rate().

Signed-off-by: Jaehoon Chung <jh80.ch...@samsung.com>
---
Changelog V2:
        - When drv_data->setup_clock is present, set to bus_hz with it.

 drivers/mmc/host/dw_mmc.c |   39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 8193e21..ead2998 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2427,10 +2427,27 @@ int dw_mci_probe(struct dw_mci *host)
                        ret = clk_set_rate(host->ciu_clk, host->pdata->bus_hz);
                        if (ret)
                                dev_warn(host->dev,
-                                        "Unable to set bus rate to %ul\n",
+                                        "Unable to set bus rate to %uHz\n",
                                         host->pdata->bus_hz);
                }
-               host->bus_hz = clk_get_rate(host->ciu_clk);
+
+               if (drv_data && drv_data->setup_clock) {
+                       ret = drv_data->setup_clock(host);
+                       if (ret) {
+                               dev_err(host->dev, "implementation specific \"
+                                       "clock setup failed\n");
+                               goto err_clk_ciu;
+                       }
+               } else {
+                       host->bus_hz = clk_get_rate(host->ciu_clk);
+               }
+       }
+
+       if (!host->bus_hz) {
+               dev_err(host->dev,
+                       "Platform data must supply bus speed\n");
+               ret = -ENODEV;
+               goto err_clk_ciu;
        }
 
        if (drv_data && drv_data->init) {
@@ -2442,15 +2459,6 @@ int dw_mci_probe(struct dw_mci *host)
                }
        }
 
-       if (drv_data && drv_data->setup_clock) {
-               ret = drv_data->setup_clock(host);
-               if (ret) {
-                       dev_err(host->dev,
-                               "implementation specific clock setup failed\n");
-                       goto err_clk_ciu;
-               }
-       }
-
        host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");
        if (IS_ERR(host->vmmc)) {
                ret = PTR_ERR(host->vmmc);
@@ -2469,13 +2477,6 @@ int dw_mci_probe(struct dw_mci *host)
                }
        }
 
-       if (!host->bus_hz) {
-               dev_err(host->dev,
-                       "Platform data must supply bus speed\n");
-               ret = -ENODEV;
-               goto err_regulator;
-       }
-
        host->quirks = host->pdata->quirks;
 
        spin_lock_init(&host->lock);
@@ -2619,8 +2620,6 @@ err_workqueue:
 err_dmaunmap:
        if (host->use_dma && host->dma_ops->exit)
                host->dma_ops->exit(host);
-
-err_regulator:
        if (host->vmmc)
                regulator_disable(host->vmmc);
 
-- 
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html