mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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>
This commit is contained in:
parent
9ca7944deb
commit
fb32061ffa
1 changed files with 3 additions and 3 deletions
|
@ -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 @@ static int alloc_nand_resource(struct platform_device *pdev)
|
|||
} 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);
|
||||
|
|
Loading…
Reference in a new issue