From e9274ba8dd0c93f12c0fd5896e11f754aa700baf Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Wed, 17 Apr 2013 13:38:12 -0300 Subject: [PATCH 104/203] 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 Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- drivers/mtd/nand/pxa3xx_nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1072,7 +1072,7 @@ static int alloc_nand_resource(struct pl 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 pla } 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);