From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@baylibre.com (Kevin Hilman) Date: Wed, 15 Feb 2017 15:56:06 -0800 Subject: [PATCH 13/18] mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init In-Reply-To: (Heiner Kallweit's message of "Wed, 15 Feb 2017 20:38:20 +0100") References: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> Message-ID: To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Heiner Kallweit writes: > Am 15.02.2017 um 20:27 schrieb Kevin Hilman: >> Heiner Kallweit writes: >> >>> I don't think this clk_disable_unprepare is right here. We do this >>> in meson_mmc_remove what should be sufficient. >> >> I don't think so, because if _clk_init() fails, then _probe will fail, >> and the driver's ->remove() will not be called. >> > In general, then the condition should be "if (ret)", not "if (!ret)". > And if _clk_init() fails, then probe jumps to label free_host, > where we have exactly this clk_disable_unprepare(host->cfg_div_clk) Then you need to update the changelog, which refers to remove, not the cleanup in probe. Kevin >> Kevin >> >>> Signed-off-by: Heiner Kallweit >>> --- >>> drivers/mmc/host/meson-gx-mmc.c | 6 +----- >>> 1 file changed, 1 insertion(+), 5 deletions(-) >>> >>> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c >>> index 74ceda75..39904fb5 100644 >>> --- a/drivers/mmc/host/meson-gx-mmc.c >>> +++ b/drivers/mmc/host/meson-gx-mmc.c >>> @@ -315,11 +315,7 @@ static int meson_mmc_clk_init(struct meson_host *host) >>> /* Get the nearest minimum clock to 400KHz */ >>> host->mmc->f_min = clk_round_rate(host->cfg_div_clk, 400000); >>> >>> - ret = meson_mmc_clk_set(host, host->mmc->f_min); >>> - if (!ret) >>> - clk_disable_unprepare(host->cfg_div_clk); >>> - >>> - return ret; >>> + return meson_mmc_clk_set(host, host->mmc->f_min); >>> } >>> >>> static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) >>