OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: nand: orion: improve handling of optional clock 

The clock gate used by orion_nand is not available on all platforms.
When getting this optional clock gate, the code masked all errors.
Let's be more precise here and actually only allow ENOENT.

EPROBE_DEFER is handled like any other error code since probe deferral
is not supported by drivers using module_platform_driver_probe().

Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Simon Baatz 2017-03-27 20:02:08 +02:00 committed by Boris Brezillon
parent 675b11d94c
commit ef980cf8b0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mtd/nand/orion_nand.c
View File

@ -156,8 +156,17 @@ static int __init orion_nand_probe(struct platform_device *pdev)
/* Not all platforms can gate the clock, so it is not
an error if the clock does not exists. */
info->clk = devm_clk_get(&pdev->dev, NULL);
if (!IS_ERR(info->clk))
clk_prepare_enable(info->clk);
if (IS_ERR(info->clk)) {
ret = PTR_ERR(info->clk);
if (ret == -ENOENT) {
info->clk = NULL;
} else {
dev_err(&pdev->dev, "failed to get clock!\n");
return ret;
}
}
clk_prepare_enable(info->clk);
ret = nand_scan(mtd, 1);
if (ret)
@ -173,9 +182,7 @@ static int __init orion_nand_probe(struct platform_device *pdev)
return 0;
no_dev:
if (!IS_ERR(info->clk))
clk_disable_unprepare(info->clk);
clk_disable_unprepare(info->clk);
return ret;
}
@ -187,8 +194,7 @@ static int orion_nand_remove(struct platform_device *pdev)
nand_release(mtd);
if (!IS_ERR(info->clk))
clk_disable_unprepare(info->clk);
clk_disable_unprepare(info->clk);
return 0;
}