On 02/01/2017 05:58 AM, Heiner Kallweit wrote:
> The following changes are quite small, therefore I combined them in
> one patch.
>
> - ret doesn't need to be initialized with 0
> - use standard !clk_rate notation to check for a zero value
> - If clk_rate is zero we return here. Therefore all further checks
> in this function for clk_rate != 0 are not needed.
> - switch from dev_warn to dev_err if the clock can't be set
> - If due to clock source and available divider values the requested
> frequency isn't matched exactly (always the case if requested
> frequency is 52 MHz), then just print the differing values as
> debug message and not as warning.
> - Also remove ret from the message as it is always 0.
> - In the case of actual frequency not exactly matching the requested
> one set mmc->actual_clock to the requested frequency.
> So far mmc->actual_clock wasn't set at all in this case.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
> ---
> drivers/mmc/host/meson-gx-mmc.c | 36 +++++++++++++++++++-----------------
> 1 file changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index 38edc60d..529a4f22 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -179,7 +179,7 @@ struct sd_emmc_desc {
> static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate)
> {
> struct mmc_host *mmc = host->mmc;
> - int ret = 0;
> + int ret;
> u32 cfg;
>
> if (clk_rate) {
> @@ -202,29 +202,31 @@ static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate)
> dev_dbg(host->dev, "change clock rate %u -> %lu\n",
> mmc->actual_clock, clk_rate);
>
> - if (clk_rate == 0) {
> + if (!clk_rate) {
> mmc->actual_clock = 0;
> return 0;
> }
>
> ret = clk_set_rate(host->cfg_div_clk, clk_rate);
> - if (ret)
> - dev_warn(host->dev, "Unable to set cfg_div_clk to %lu. ret=%d\n",
> - clk_rate, ret);
> - else if (clk_rate && clk_rate != clk_get_rate(host->cfg_div_clk))
> - dev_warn(host->dev, "divider requested rate %lu != actual rate %lu: ret=%d\n",
> - clk_rate, clk_get_rate(host->cfg_div_clk), ret);
> - else
> - mmc->actual_clock = clk_rate;
> -
> - /* (re)start clock, if non-zero */
> - if (!ret && clk_rate) {
> - cfg = readl(host->regs + SD_EMMC_CFG);
> - cfg &= ~CFG_STOP_CLOCK;
> - writel(cfg, host->regs + SD_EMMC_CFG);
> + if (ret) {
> + dev_err(host->dev, "Unable to set cfg_div_clk to %lu. ret=%d\n",
> + clk_rate, ret);
> + return ret;
> }
>
> - return ret;
> + if (clk_rate != clk_get_rate(host->cfg_div_clk))
> + dev_dbg(host->dev,
> + "divider requested rate %lu != actual rate %lu\n",
> + clk_rate, clk_get_rate(host->cfg_div_clk));
> +
> + mmc->actual_clock = clk_rate;
debug message is described actual_rate as clk_get_rate()..
What is correct "actual_clock"?
Best Regards,
Jaehoon Chung
> +
> + /* (re)start clock */
> + cfg = readl(host->regs + SD_EMMC_CFG);
> + cfg &= ~CFG_STOP_CLOCK;
> + writel(cfg, host->regs + SD_EMMC_CFG);
> +
> + return 0;
> }
>
> /*
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
