Commit 9c59fda3 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Linus Walleij
Browse files

pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe() 



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

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220308100956.2750295-10-wenst@chromium.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e5fabbe4

drivers/pinctrl/mediatek/pinctrl-moore.c

+9 −16
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ static int mtk_build_functions(struct mtk_pinctrl *hw) 
int mtk_moore_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;
@@ -616,11 +617,9 @@ int mtk_moore_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);
@@ -665,17 +664,13 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev, 


	/* Setup groups descriptions per SoC types */

	err = mtk_build_groups(hw);

	if (err) {

		dev_err(&pdev->dev, "Failed to build groups\n");

		return err;

	}

	if (err)

		return dev_err_probe(dev, err, "Failed to build groups\n");



	/* Setup functions descriptions per SoC types */

	err = mtk_build_functions(hw);

	if (err) {

		dev_err(&pdev->dev, "Failed to build functions\n");

		return err;

	}

	if (err)

		return dev_err_probe(dev, err, "Failed to build functions\n");



	/* For able to make pinctrl_claim_hogs, we must not enable pinctrl

	 * until all groups and functions are being added one.
@@ -691,10 +686,8 @@ int mtk_moore_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);