Skip to contentSkip to conversation

mmc: sdhci-of-dwcmshc: minor cleanups

PATCH In review Artem Shimko 2 participants 4 messages May 22 – May 29

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover mmc: sdhci-of-dwcmshc: minor cleanups

Hi,

This series introduces two non-functional cleanups for the Synopsys DWC MSHC driver.

Patch 1 removes redundant IS_ERR() checks for bus_clk in suspend/resume paths where the called functions already have internal protection.

Patch 2 converts error handling in probe paths to use dev_err_probe() macro for more compact code and better deferred probe debugging.

--
Best regards,
Artem
---
ChangeLog:
v1:
* https://lore.kernel.org/all/[email protected]/T/#t
v2:
* https://lore.kernel.org/all/[email protected]/T/#t
v3:
* Drop fsleep() patch to keep initial delay/sleep values

Artem Shimko (2):
mmc: sdhci-of-dwcmshc: remove redundant IS_ERR() check
mmc: sdhci-of-dwcmshc: use dev_err_probe() to simplify error paths

 drivers/mmc/host/sdhci-of-dwcmshc.c | 36 +++++++++++------------------
 1 file changed, 13 insertions(+), 23 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH v3 1/2 mmc: sdhci-of-dwcmshc: remove redundant IS_ERR() check

The clk_disable_unprepare() function has internal protection against ERR_PTR and NULL pointers (IS_ERR_OR_NULL). Remove the redundant IS_ERR() check for bus_clk in dwcmshc_suspend() and in the error path of dwcmshc_resume() to simplify the code.

Note that the clk_prepare_enable() call in dwcmshc_resume() must retain its IS_ERR() check because clk_prepare() only handles NULL pointers, not ERR_PTR.

No functional change intended.

---
 drivers/mmc/host/sdhci-of-dwcmshc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +2 -4
index 0b2158a7e409..c1ed7f28d75b 100644
@@ -2564,8 +2564,7 @@ static int dwcmshc_suspend(struct device *dev)
 		return ret;
 
 	clk_disable_unprepare(pltfm_host->clk);
-	if (!IS_ERR(priv->bus_clk))
-		clk_disable_unprepare(priv->bus_clk);
+	clk_disable_unprepare(priv->bus_clk);
 
 	clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks);
 
@@ -2608,8 +2607,7 @@ static int dwcmshc_resume(struct device *dev)
 disable_other_clks:
 	clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks);
 disable_bus_clk:
-	if (!IS_ERR(priv->bus_clk))
-		clk_disable_unprepare(priv->bus_clk);
+	clk_disable_unprepare(priv->bus_clk);
 disable_clk:
 	clk_disable_unprepare(pltfm_host->clk);
 	return ret;
Signature · 1 line
2.43.0
#2 lore raw

PATCH v3 2/2 mmc: sdhci-of-dwcmshc: use dev_err_probe() to simplify error paths

In reply to Artem Shimko

Replace common pattern of dev_err() + return with dev_err_probe() in probe functions and their callees. This macro provides standardized error message format with symbolic error names and adds deferred probe debugging information.

The conversion makes the code more compact and ensures consistent error logging across all initialization paths.

---
 drivers/mmc/host/sdhci-of-dwcmshc.c | 30 +++++++++++------------------
 1 file changed, 11 insertions(+), 19 deletions(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +11 -19
index c1ed7f28d75b..c758e904f5c8 100644
@@ -917,11 +917,9 @@ static int dwcmshc_rk35xx_init(struct device *dev, struct sdhci_host *host,
 		return -ENOMEM;
 
 	priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc));
-	if (IS_ERR(priv->reset)) {
-		err = PTR_ERR(priv->reset);
-		dev_err(mmc_dev(host->mmc), "failed to get reset control %d\n", err);
-		return err;
-	}
+	if (IS_ERR(priv->reset))
+		return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->reset),
+				     "failed to get reset control\n");
 
 	err = dwcmshc_get_enable_other_clks(mmc_dev(host->mmc), dwc_priv,
 					    ARRAY_SIZE(clk_ids), clk_ids);
@@ -1781,10 +1779,8 @@ static int eic7700_init(struct device *dev, struct sdhci_host *host, struct dwcm
 	dwc_priv->priv = priv;
 
 	ret = sdhci_eic7700_reset_init(dev, dwc_priv->priv);
-	if (ret) {
-		dev_err(dev, "failed to reset\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to reset\n");
 
 	ret = dwcmshc_get_enable_other_clks(mmc_dev(host->mmc), dwc_priv,
 					    ARRAY_SIZE(clk_ids), clk_ids);
@@ -1792,16 +1788,14 @@ static int eic7700_init(struct device *dev, struct sdhci_host *host, struct dwcm
 		return ret;
 
 	ret = of_parse_phandle_with_fixed_args(dev->of_node, "eswin,hsp-sp-csr", 2, 0, &args);
-	if (ret) {
-		dev_err(dev, "Fail to parse 'eswin,hsp-sp-csr' phandle (%d)\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "Fail to parse 'eswin,hsp-sp-csr' phandle\n");
 
 	hsp_regmap = syscon_node_to_regmap(args.np);
 	if (IS_ERR(hsp_regmap)) {
-		dev_err(dev, "Failed to get regmap for 'eswin,hsp-sp-csr'\n");
 		of_node_put(args.np);
-		return PTR_ERR(hsp_regmap);
+		return dev_err_probe(dev, PTR_ERR(hsp_regmap),
+				     "Failed to get regmap for 'eswin,hsp-sp-csr'\n");
 	}
 	hsp_int_status = args.args[0];
 	hsp_pwr_ctrl = args.args[1];
@@ -2408,10 +2402,8 @@ static int dwcmshc_probe(struct platform_device *pdev)
 	u32 extra, caps;
 
 	pltfm_data = device_get_match_data(&pdev->dev);
-	if (!pltfm_data) {
-		dev_err(&pdev->dev, "Error: No device match data found\n");
-		return -ENODEV;
-	}
+	if (!pltfm_data)
+		return dev_err_probe(&pdev->dev, -ENODEV, "No device match data found\n");
 
 	host = sdhci_pltfm_init(pdev, &pltfm_data->pdata,
 				sizeof(struct dwcmshc_priv));
Signature · 1 line
2.43.0
#3 lore raw
In reply to Artem Shimko
Quoted 28 lines · Artem Shimko

Hi,

This series introduces two non-functional cleanups for the Synopsys DWC MSHC driver.

Patch 1 removes redundant IS_ERR() checks for bus_clk in suspend/resume paths where the called functions already have internal protection.

Patch 2 converts error handling in probe paths to use dev_err_probe() macro for more compact code and better deferred probe debugging.

--
Best regards,
Artem
---
ChangeLog:
v1:
* https://lore.kernel.org/all/[email protected]/T/#t
v2:
* https://lore.kernel.org/all/[email protected]/T/#t
v3:
* Drop fsleep() patch to keep initial delay/sleep values

Artem Shimko (2):
mmc: sdhci-of-dwcmshc: remove redundant IS_ERR() check
mmc: sdhci-of-dwcmshc: use dev_err_probe() to simplify error paths

Quoted 5 lines
 drivers/mmc/host/sdhci-of-dwcmshc.c | 36 +++++++++++------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

--
2.43.0

The series applied for next, thanks!

Kind regards
Uffe