Skip to contentSkip to conversation

memory: brcmstb_dpfe: Simplify with dev_err_probe()

PATCH Applied Krzysztof Kozlowski 3 participants 6 messages Aug 28, 2020 – Sep 2, 2020

Subsystems (4)
Tegra architecture support Memory controller drivers Broadcom BCM7XXX Arm architecture Broadcom stb dpfe driver
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

PATCH 1/2 memory: brcmstb_dpfe: Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 drivers/memory/brcmstb_dpfe.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/memory/brcmstb_dpfe.c +2 -5
index dcf50bb8dd69..f43ba69fbb3e 100644
@@ -901,11 +901,8 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
 	}
 
 	ret = brcmstb_dpfe_download_firmware(priv);
-	if (ret) {
-		if (ret != -EPROBE_DEFER)
-			dev_err(dev, "Couldn't download firmware -- %d\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "Couldn't download firmware\n");
 
 	ret = sysfs_create_groups(&pdev->dev.kobj, priv->dpfe_api->sysfs_attrs);
 	if (!ret)
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH 2/2 memory: tegra186-emc: Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 drivers/memory/tegra/tegra186-emc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/memory/tegra/tegra186-emc.c +2 -8
index 8478f59db432..fa8af17b0e2d 100644
@@ -172,14 +172,8 @@ static int tegra186_emc_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	emc->bpmp = tegra_bpmp_get(&pdev->dev);
-	if (IS_ERR(emc->bpmp)) {
-		err = PTR_ERR(emc->bpmp);
-
-		if (err != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "failed to get BPMP: %d\n", err);
-
-		return err;
-	}
+	if (IS_ERR(emc->bpmp))
+		return dev_err_probe(&pdev->dev, PTR_ERR(emc->bpmp), "failed to get BPMP\n");
 
 	emc->clk = devm_clk_get(&pdev->dev, "emc");
 	if (IS_ERR(emc->clk)) {
Signature · 1 line
2.17.1
author maintainer Applied
#2 lore raw

Re: [PATCH 2/2] memory: tegra186-emc: Simplify with dev_err_probe()

Quoted 7 lines · Krzysztof Kozlowski

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 drivers/memory/tegra/tegra186-emc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Applied.

Best regards,
Krzysztof

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer Acked-by on v1 1/2
#3 lore raw
In reply to Krzysztof Kozlowski
Quoted 5 lines · Krzysztof Kozlowski

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

Signed-off-by Krzysztof Kozlowski <[email protected]>
Acked-by Markus Mayer <[email protected]>
Quoted 25 lines
---
 drivers/memory/brcmstb_dpfe.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/memory/brcmstb_dpfe.c +2 -6
index dcf50bb8dd69..f43ba69fbb3e 100644
@@ -901,11 +901,8 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
        }
 
        ret = brcmstb_dpfe_download_firmware(priv);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "Couldn't download firmware -- %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Couldn't download firmware\n");
 
        ret = sysfs_create_groups(&pdev->dev.kobj, priv->dpfe_api->sysfs_attrs);
        if (!ret)
--

2.17.1