Commit 95211a98 authored by Philipp Zabel's avatar Philipp Zabel Committed by Ulf Hansson
Browse files

mmc: sdhci-st: simplify optional reset handling 



As of commit bb475230 ("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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20210305090827.19124-1-p.zabel@pengutronix.de


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8c87dab9

drivers/mmc/host/sdhci-st.c

+7 −12
Original line number Diff line number Diff line
@@ -362,10 +362,9 @@ 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

		return PTR_ERR(rstc);

	reset_control_deassert(rstc);



	host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, sizeof(*pdata));
@@ -432,7 +431,6 @@ static int sdhci_st_probe(struct platform_device *pdev) 
err_of:

	sdhci_pltfm_free(pdev);

err_pltfm_init:

	if (rstc)

	reset_control_assert(rstc);



	return ret;
@@ -450,7 +448,6 @@ static int sdhci_st_remove(struct platform_device *pdev) 


	clk_disable_unprepare(pdata->icnclk);



	if (rstc)

	reset_control_assert(rstc);



	return ret;
@@ -471,7 +468,6 @@ static int sdhci_st_suspend(struct device *dev) 
	if (ret)

		goto out;



	if (pdata->rstc)

	reset_control_assert(pdata->rstc);



	clk_disable_unprepare(pdata->icnclk);
@@ -498,7 +494,6 @@ static int sdhci_st_resume(struct device *dev) 
		return ret;

	}



	if (pdata->rstc)

	reset_control_deassert(pdata->rstc);



	st_mmcss_cconfig(np, host);