[PATCH 07/14] mmc: sdhci-st: simplify optional reset handling

[Philipp Zabel]

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.za...@pengutronix.de>
Cc: Peter Griffin <peter.grif...@linaro.org>
Cc: Giuseppe Cavallaro <peppe.cavall...@st.com>
Cc: Maxime Coquelin <maxime.coque...@st.com>
Cc: Ulf Hansson <ulf.hans...@linaro.org>
---
 drivers/mmc/host/sdhci-st.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c
index ed92ce729dde1..5a782b9bae381 100644
--- a/drivers/mmc/host/sdhci-st.c
+++ b/drivers/mmc/host/sdhci-st.c
@@ -371,11 +371,10 @@ static int sdhci_st_probe(struct platform_device *pdev)
        if (IS_ERR(icnclk))
                icnclk = NULL;
 
-       rstc = devm_reset_control_get(&pdev->dev, NULL);
+       rstc = devm_reset_control_get_optional(&pdev->dev, NULL);
        if (IS_ERR(rstc))
-               rstc = NULL;
-       else
-               reset_control_deassert(rstc);
+               return PTR_ERR(rstc);
+       reset_control_deassert(rstc);
 
        host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, sizeof(*pdata));
        if (IS_ERR(host)) {
@@ -435,8 +434,7 @@ static int sdhci_st_probe(struct platform_device *pdev)
 err_of:
        sdhci_pltfm_free(pdev);
 err_pltfm_init:
-       if (rstc)
-               reset_control_assert(rstc);
+       reset_control_assert(rstc);
 
        return ret;
 }
@@ -453,8 +451,7 @@ static int sdhci_st_remove(struct platform_device *pdev)
 
        clk_disable_unprepare(pdata->icnclk);
 
-       if (rstc)
-               reset_control_assert(rstc);
+       reset_control_assert(rstc);
 
        return ret;
 }
@@ -470,8 +467,7 @@ static int sdhci_st_suspend(struct device *dev)
        if (ret)
                goto out;
 
-       if (pdata->rstc)
-               reset_control_assert(pdata->rstc);
+       reset_control_assert(pdata->rstc);
 
        clk_disable_unprepare(pdata->icnclk);
        clk_disable_unprepare(pltfm_host->clk);
@@ -489,8 +485,7 @@ static int sdhci_st_resume(struct device *dev)
        clk_prepare_enable(pltfm_host->clk);
        clk_prepare_enable(pdata->icnclk);
 
-       if (pdata->rstc)
-               reset_control_deassert(pdata->rstc);
+       reset_control_deassert(pdata->rstc);
 
        st_mmcss_cconfig(np, host);
 
-- 
2.11.0