[PATCH] mmc: sunxi: Use devm_reset_control_get_optional() for reset control

[David Lanzendörfer]

Acked-by: David Lanzendörfer <david.lanzendoerfer at o2s.ch>

> 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 <wens at csie.org>
> Cc: <stable at vger.kernel.org> # 3.16+
> ---
> 
> Arnd had some proposals about the reset control API.
> Not sure if the sunxi-mmc driver was on that list.
> 
> ---
>  drivers/mmc/host/sunxi-mmc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
> index e8a4218b5726..459ed1b601db 100644
> --- a/drivers/mmc/host/sunxi-mmc.c
> +++ b/drivers/mmc/host/sunxi-mmc.c
> @@ -930,7 +930,9 @@ static int sunxi_mmc_resource_request(struct
> sunxi_mmc_host *host, return PTR_ERR(host->clk_sample);
>  	}
> 
> -	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) {

-- 
David Lanzendörfer
OpenSourceSupport GmbH
System engineer and supporter
http://www.o2s.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150303/fb3f9b06/attachment.sig>