diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-04-17 13:38:12 -0300 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-05 20:47:42 +0100 |
| commit | fb32061ffaa9da61f72f79120a39729aa1736de0 (patch) | |
| tree | 3c73190fc00952cec09d1c10e86d2ea4a6c82bb8 /drivers/mtd/nand | |
| parent | 9ca7944deb25d415f7fc5915b9828a857161b97f (diff) | |
| download | linux-fb32061ffaa9da61f72f79120a39729aa1736de0.tar.bz2 | |
mtd: nand: pxa3xx: Use clk_prepare_enable and clk_disable_unprepare
This patch converts the module to use clk_prepare_enable and
clk_disable_unprepare variants as required by common clock framework.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 188358136970..1c03f9c73f8d 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1072,7 +1072,7 @@ static int alloc_nand_resource(struct platform_device *pdev) dev_err(&pdev->dev, "failed to get nand clock\n"); return PTR_ERR(info->clk); } - clk_enable(info->clk); + clk_prepare_enable(info->clk); /* * This is a dirty hack to make this driver work from devicetree @@ -1142,7 +1142,7 @@ fail_free_buf: } else kfree(info->data_buff); fail_disable_clk: - clk_disable(info->clk); + clk_disable_unprepare(info->clk); return ret; } @@ -1168,7 +1168,7 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) } else kfree(info->data_buff); - clk_disable(info->clk); + clk_disable_unprepare(info->clk); for (cs = 0; cs < pdata->num_cs; cs++) nand_release(info->host[cs]->mtd); |