| Message ID | 20210305090827.19124-1-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: sdhci-st: simplify optional reset handling | expand |
On Fri, 5 Mar 2021 at 10:08, Philipp Zabel <p.zabel@pengutronix.de> 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@pengutronix.de> Applied for next, thanks! Kind regards Uffe > --- > 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 962872aec164..78941ac3a1d6 100644 > --- a/drivers/mmc/host/sdhci-st.c > +++ b/drivers/mmc/host/sdhci-st.c > @@ -362,11 +362,10 @@ static int sdhci_st_probe(struct platform_device *pdev) > if (IS_ERR(icnclk)) > icnclk = NULL; > > - rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); > + rstc = devm_reset_control_get_optional_exclusive(&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)) { > @@ -432,8 +431,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; > } > @@ -450,8 +448,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; > } > @@ -471,8 +468,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); > @@ -498,8 +494,7 @@ static int sdhci_st_resume(struct device *dev) > return ret; > } > > - if (pdata->rstc) > - reset_control_deassert(pdata->rstc); > + reset_control_deassert(pdata->rstc); > > st_mmcss_cconfig(np, host); > > -- > 2.29.2 >
diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c index 962872aec164..78941ac3a1d6 100644 --- a/drivers/mmc/host/sdhci-st.c +++ b/drivers/mmc/host/sdhci-st.c @@ -362,11 +362,10 @@ static int sdhci_st_probe(struct platform_device *pdev) if (IS_ERR(icnclk)) icnclk = NULL; - rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); + rstc = devm_reset_control_get_optional_exclusive(&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)) { @@ -432,8 +431,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; } @@ -450,8 +448,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; } @@ -471,8 +468,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); @@ -498,8 +494,7 @@ static int sdhci_st_resume(struct device *dev) return ret; } - if (pdata->rstc) - reset_control_deassert(pdata->rstc); + reset_control_deassert(pdata->rstc); st_mmcss_cconfig(np, host);
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@pengutronix.de> --- drivers/mmc/host/sdhci-st.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)