Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: nand: clk: preparation for switch to common clock framework

Browse Source 
As a first step towards migrating davinci platforms to use common clock
framework, replace all instances of clk_enable() with clk_prepare_enable()
and clk_disable() with clk_disable_unprepare(). Until the platform is
switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
adds a might_sleep() call and would work without any issues.

This will make it easy later to switch to common clk based implementation
of clk driver from DaVinci specific driver.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
m-karicheri2@ti.com 2012-09-12 21:06:19 +00:00 committed by David Woodhouse
parent 6ed089c0a1
commit ea73fe7f0d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/nand/davinci_nand.c
View File

@ -724,7 +724,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
goto err_clk; goto err_clk;
} }
ret = clk_enable(info->clk); ret = clk_prepare_enable(info->clk);
if (ret < 0) { if (ret < 0) {
dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n", dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n",
ret); ret);
@ -835,7 +835,7 @@ syndrome_done:
err_scan: err_scan:
err_timing: err_timing:
clk_disable(info->clk); clk_disable_unprepare(info->clk);
err_clk_enable: err_clk_enable:
clk_put(info->clk); clk_put(info->clk);
@ -872,7 +872,7 @@ static int __exit nand_davinci_remove(struct platform_device *pdev)
nand_release(&info->mtd); nand_release(&info->mtd);
clk_disable(info->clk); clk_disable_unprepare(info->clk);
clk_put(info->clk); clk_put(info->clk);
kfree(info); kfree(info);