pinctrl: mediatek: pinctrl-mtk-common: Simplify with dev_err_probe()

Use the dev_err_probe() helper to simplify error handling during probe.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220308100956.2750295-12-wenst@chromium.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 334cb85855a9317f4066ab565bd15737cf9b685d..1ec9a7fa2408d403cb9cdedc59563bc9ab01c5f0 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1013,10 +1013,12 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, struct platform_device *pdev)
        return mtk_eint_do_init(pctl->eint);
 }
 
+/* This is used as a common probe function */
 int mtk_pctrl_init(struct platform_device *pdev,
                const struct mtk_pinctrl_devdata *data,
                struct regmap *regmap)
 {
+       struct device *dev = &pdev->dev;
        struct pinctrl_pin_desc *pins;
        struct mtk_pinctrl *pctl;
        struct device_node *np = pdev->dev.of_node, *node;
@@ -1030,10 +1032,9 @@ int mtk_pctrl_init(struct platform_device *pdev,
        platform_set_drvdata(pdev, pctl);
 
        prop = of_find_property(np, "pins-are-numbered", NULL);
-       if (!prop) {
-               dev_err(&pdev->dev, "only support pins-are-numbered format\n");
-               return -EINVAL;
-       }
+       if (!prop)
+               return dev_err_probe(dev, -EINVAL,
+                                    "only support pins-are-numbered format\n");
 
        node = of_parse_phandle(np, "mediatek,pctl-regmap", 0);
        if (node) {
@@ -1044,8 +1045,7 @@ int mtk_pctrl_init(struct platform_device *pdev,
        } else if (regmap) {
                pctl->regmap1  = regmap;
        } else {
-               dev_err(&pdev->dev, "Pinctrl node has not register regmap.\n");
-               return -EINVAL;
+               return dev_err_probe(dev, -EINVAL, "Cannot find pinctrl regmap.\n");
        }
 
        /* Only 8135 has two base addr, other SoCs have only one. */
@@ -1059,10 +1059,8 @@ int mtk_pctrl_init(struct platform_device *pdev,
 
        pctl->devdata = data;
        ret = mtk_pctrl_build_state(pdev);
-       if (ret) {
-               dev_err(&pdev->dev, "build state failed: %d\n", ret);
-               return -EINVAL;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "build state failed\n");
 
        pins = devm_kcalloc(&pdev->dev, pctl->devdata->npins, sizeof(*pins),
                            GFP_KERNEL);
@@ -1083,10 +1081,9 @@ int mtk_pctrl_init(struct platform_device *pdev,
 
        pctl->pctl_dev = devm_pinctrl_register(&pdev->dev, &pctl->pctl_desc,
                                               pctl);
-       if (IS_ERR(pctl->pctl_dev)) {
-               dev_err(&pdev->dev, "couldn't register pinctrl driver\n");
-               return PTR_ERR(pctl->pctl_dev);
-       }
+       if (IS_ERR(pctl->pctl_dev))
+               return dev_err_probe(dev, PTR_ERR(pctl->pctl_dev),
+                                    "Couldn't register pinctrl driver\n");
 
        pctl->chip = devm_kzalloc(&pdev->dev, sizeof(*pctl->chip), GFP_KERNEL);
        if (!pctl->chip)