Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753666Ab2EZQEF (ORCPT ); Sat, 26 May 2012 12:04:05 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:38910 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752393Ab2EZQED (ORCPT ); Sat, 26 May 2012 12:04:03 -0400 From: Fabio Estevam To: kernel@pengutronix.de Cc: shawn.guo@freescale.com, Fabio Estevam , Herbert Xu , Subject: [PATCH v2 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare Date: Sat, 26 May 2012 13:03:52 -0300 Message-Id: <1338048232-3523-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1337987696-31728-4-git-send-email-festevam@gmail.com> References: <1337987696-31728-4-git-send-email-festevam@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1479 Lines: 53 From: Fabio Estevam Prepare the clock before enabling it. Cc: Herbert Xu Cc: Signed-off-by: Fabio Estevam --- Changes since v1: - Add missing clk_disable_unprepare(clk) in the remove path drivers/char/hw_random/mxc-rnga.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c index 187c6be..430582c 100644 --- a/drivers/char/hw_random/mxc-rnga.c +++ b/drivers/char/hw_random/mxc-rnga.c @@ -154,7 +154,7 @@ static int __init mxc_rnga_probe(struct platform_device *pdev) goto out; } - clk_enable(clk); + clk_prepare_enable(clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -196,7 +196,7 @@ err_ioremap: release_mem_region(res->start, resource_size(res)); err_region: - clk_disable(clk); + clk_disable_unprepare(clk); clk_put(clk); out: @@ -215,7 +215,7 @@ static int __exit mxc_rnga_remove(struct platform_device *pdev) release_mem_region(res->start, resource_size(res)); - clk_disable(clk); + clk_disable_unprepare(clk); clk_put(clk); return 0; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/