From: Chen-Yu Tsai Date: Tue, 3 Mar 2015 01:44:40 +0000 (+0800) Subject: mmc: sunxi: Use devm_reset_control_get_optional() for reset control X-Git-Tag: v3.16.35~2270 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d84753e0d715f04e3985b0e51db3fe62d818b941;p=thirdparty%2Fkernel%2Fstable.git mmc: sunxi: Use devm_reset_control_get_optional() for reset control commit 9e71c589e44ddf2b86f361c81e360c6b0d0354b1 upstream. The reset control for the sunxi mmc controller is optional. Some newer platforms (sun6i, sun8i, sun9i) have it, while older ones (sun4i, sun5i, sun7i) don't. Use the properly stubbed _optional version so the driver does not fail to compile when RESET_CONTROLLER=n. This patch also adds a check for deferred probing on the reset control. Signed-off-by: Chen-Yu Tsai Acked-by: David Lanzendörfer Signed-off-by: Ulf Hansson [ luis: backported to 3.16: adjusted context ] Signed-off-by: Luis Henriques --- diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index 024f67c98cdca..97823c68600a2 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -909,7 +909,9 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host, return PTR_ERR(host->clk_mmc); } - host->reset = devm_reset_control_get(&pdev->dev, "ahb"); + host->reset = devm_reset_control_get_optional(&pdev->dev, "ahb"); + if (PTR_ERR(host->reset) == -EPROBE_DEFER) + return PTR_ERR(host->reset); ret = clk_prepare_enable(host->clk_ahb); if (ret) {