From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@baylibre.com (Kevin Hilman) Date: Fri, 17 Feb 2017 11:51:24 -0800 Subject: [PATCH v2 6/9] mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init In-Reply-To: (Heiner Kallweit's message of "Thu, 16 Feb 2017 20:42:06 +0100") References: <7d5263e2-9325-dedb-a5f6-954c4a09e977@gmail.com> Message-ID: To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Heiner Kallweit writes: > This clk_disable_unprepare isn't right here. At first the condition > should be "if (ret)" as the disable/unprepare is supposed to be > executed if the previous command fails. > And if the previous command fails and meson_mmc_clk_init returns > an error, then probe jumps to label free_host where we have this > disable/unprepare already. > > Signed-off-by: Heiner Kallweit Acked-by: Kevin Hilman > --- > v2: > - extended commit message > --- > 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 68e76fa8..850b0152 100644 > --- a/drivers/mmc/host/meson-gx-mmc.c > +++ b/drivers/mmc/host/meson-gx-mmc.c > @@ -320,11 +320,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)