linux-kernel - Re: [PATCH next] mmc: sdhci-pxav3: Remove checks for optional core clock in error/remove path

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 21 Jan 2015 14:21:21 +0100
From:	Ulf Hansson <ulf.hansson@...aro.org>
To:	Jisheng Zhang <jszhang@...vell.com>
Cc:	Chris Ball <chris@...ntf.net>,
	Peter Griffin <peter.griffin@...aro.org>,
	linux-mmc <linux-mmc@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH next] mmc: sdhci-pxav3: Remove checks for optional core
 clock in error/remove path

On 5 January 2015 at 08:59, Jisheng Zhang <jszhang@...vell.com> wrote:
> Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
> clk_{unprepare, disable}()") allows NULL or error pointer to be passed
> unconditionally.
>
> This patch is to simplify probe error and remove code paths.
>
> However, we reserve the core clock checks in runtime suspend/resume code
> because we want a little smaller latency.
>
> This patch can be applied after the sdhci-pxav3 unbalanced pm/clock issues
> patches being merged.
> http://lists.infradead.org/pipermail/linux-arm-kernel/2015-January/313103.html

I remove these three lines from the commit msg.

>
> Signed-off-by: Jisheng Zhang <jszhang@...vell.com>

Thanks! Applied for next.

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-pxav3.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
> index 4de39fb..63967b8 100644
> --- a/drivers/mmc/host/sdhci-pxav3.c
> +++ b/drivers/mmc/host/sdhci-pxav3.c
> @@ -398,8 +398,7 @@ err_of_parse:
>  err_cd_req:
>  err_mbus_win:
>         clk_disable_unprepare(pxa->clk_io);
> -       if (!IS_ERR(pxa->clk_core))
> -               clk_disable_unprepare(pxa->clk_core);
> +       clk_disable_unprepare(pxa->clk_core);
>  err_clk_get:
>         sdhci_pltfm_free(pdev);
>         return ret;
> @@ -418,8 +417,7 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
>         sdhci_remove_host(host, 1);
>
>         clk_disable_unprepare(pxa->clk_io);
> -       if (!IS_ERR(pxa->clk_core))
> -               clk_disable_unprepare(pxa->clk_core);
> +       clk_disable_unprepare(pxa->clk_core);
>
>         sdhci_pltfm_free(pdev);
>
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/