Re: [PATCH v2 08/14] mmc: sunxi: simplify optional reset handling

[Ulf Hansson]

On 15 March 2017 at 12:31, Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> wrote:
> As of commit bb475230b8e5 ("reset: make optional functions really
> optional"), the reset framework API calls use NULL pointers to describe
> optional, non-present reset controls.
>
> This allows to return errors from devm_reset_control_get_optional and to
> call reset_control_(de)assert unconditionally.
>
> Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Acked-by: Chen-Yu Tsai <wens@xxxxxxxx>

Thanks, applied for next!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sunxi-mmc.c | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
> index 6ffcd2838272c..4dbdcdfaeb86a 100644
> --- a/drivers/mmc/host/sunxi-mmc.c
> +++ b/drivers/mmc/host/sunxi-mmc.c
> @@ -1177,7 +1177,7 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
>         }
>
>         host->reset = devm_reset_control_get_optional(&pdev->dev, "ahb");
> -       if (PTR_ERR(host->reset) == -EPROBE_DEFER)
> +       if (IS_ERR(host->reset))
>                 return PTR_ERR(host->reset);
>
>         ret = clk_prepare_enable(host->clk_ahb);
> @@ -1204,12 +1204,10 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
>                 goto error_disable_clk_output;
>         }
>
> -       if (!IS_ERR(host->reset)) {
> -               ret = reset_control_deassert(host->reset);
> -               if (ret) {
> -                       dev_err(&pdev->dev, "reset err %d\n", ret);
> -                       goto error_disable_clk_sample;
> -               }
> +       ret = reset_control_deassert(host->reset);
> +       if (ret) {
> +               dev_err(&pdev->dev, "reset err %d\n", ret);
> +               goto error_disable_clk_sample;
>         }
>
>         /*
> @@ -1225,8 +1223,7 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
>                         sunxi_mmc_handle_manual_stop, 0, "sunxi-mmc", host);
>
>  error_assert_reset:
> -       if (!IS_ERR(host->reset))
> -               reset_control_assert(host->reset);
> +       reset_control_assert(host->reset);
>  error_disable_clk_sample:
>         clk_disable_unprepare(host->clk_sample);
>  error_disable_clk_output:
> @@ -1309,8 +1306,7 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
>         disable_irq(host->irq);
>         sunxi_mmc_reset_host(host);
>
> -       if (!IS_ERR(host->reset))
> -               reset_control_assert(host->reset);
> +       reset_control_assert(host->reset);
>
>         clk_disable_unprepare(host->clk_sample);
>         clk_disable_unprepare(host->clk_output);
> --
> 2.11.0
>