mmc: dw_mmc: replace the bus_hz checking point
Subsystems (2)
Jaehoon Chung
maintainerPATCH 3/7 mmc: dw_mmc: replace the bus_hz checking point
It's right that check immediately whether host->bus_hz is assigned or not.
Signed-off-by Jaehoon Chung <[email protected]>
--- drivers/mmc/host/dw_mmc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/mmc/host/dw_mmc.c +8 -11
@@ -2115,7 +2115,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)const struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u32 freq[2 ]; -u8 bus_width; mmc =mmc_alloc_host (sizeof (struct dw_mci_slot ), host->dev);if (!mmc)
@@ -2428,12 +2427,19 @@ 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 (!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) { ret = drv_data->init (host);if (ret) {
@@ -2470,13 +2476,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);
@@ -2620,8 +2619,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);
Signature · 1 line
1.7.9.5