pinctrl: mediatek: pinctrl-paris: 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-11-wenst@chromium.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index bed98623ecf3ae26c77db89ddd4a094c28552f8d..85ce7ae5ec6510ac9462f092106ac3a1ccd1f5dd 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -1024,6 +1024,7 @@ static int mtk_pctrl_build_state(struct platform_device *pdev)
 int mtk_paris_pinctrl_probe(struct platform_device *pdev,
                            const struct mtk_pin_soc *soc)
 {
+       struct device *dev = &pdev->dev;
        struct pinctrl_pin_desc *pins;
        struct mtk_pinctrl *hw;
        int err, i;
@@ -1036,11 +1037,9 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
        hw->soc = soc;
        hw->dev = &pdev->dev;
 
-       if (!hw->soc->nbase_names) {
-               dev_err(&pdev->dev,
+       if (!hw->soc->nbase_names)
+               return dev_err_probe(dev, -EINVAL,
                        "SoC should be assigned at least one register base\n");
-               return -EINVAL;
-       }
 
        hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
                                      sizeof(*hw->base), GFP_KERNEL);
@@ -1065,10 +1064,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
        spin_lock_init(&hw->lock);
 
        err = mtk_pctrl_build_state(pdev);
-       if (err) {
-               dev_err(&pdev->dev, "build state failed: %d\n", err);
-               return -EINVAL;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "build state failed\n");
 
        /* Copy from internal struct mtk_pin_desc to register to the core */
        pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
@@ -1106,10 +1103,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
 
        /* Build gpiochip should be after pinctrl_enable is done */
        err = mtk_build_gpiochip(hw);
-       if (err) {
-               dev_err(&pdev->dev, "Failed to add gpio_chip\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "Failed to add gpio_chip\n");
 
        platform_set_drvdata(pdev, hw);