pinctrl: msm: Use devm_pinctrl_register() for pinctrl registration (fe0267f4) · Commits · 戴 / test

Use devm_pinctrl_register() for pin control registration and clean the error path. Signed-off-by:

Laxman Dewangan <ldewangan@nvidia.com> Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Lee Jones <lee.jones@linaro.org> Cc: Stephen Boyd <sboyd@codeaurora.org> Reviewed-by:

Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

drivers/pinctrl/qcom/pinctrl-msm.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -898,17 +898,16 @@ int msm_pinctrl_probe(struct platform_device *pdev,
		msm_pinctrl_desc.name = dev_name(&pdev->dev);
		msm_pinctrl_desc.pins = pctrl->soc->pins;
		msm_pinctrl_desc.npins = pctrl->soc->npins;
		pctrl->pctrl = pinctrl_register(&msm_pinctrl_desc, &pdev->dev, pctrl);
		pctrl->pctrl = devm_pinctrl_register(&pdev->dev, &msm_pinctrl_desc,
		pctrl);
		if (IS_ERR(pctrl->pctrl)) {
		dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
		return PTR_ERR(pctrl->pctrl);
		}

		ret = msm_gpio_init(pctrl);
		if (ret) {
		pinctrl_unregister(pctrl->pctrl);
		if (ret)
		return ret;
		}

		platform_set_drvdata(pdev, pctrl);

		@@ -923,7 +922,6 @@ int msm_pinctrl_remove(struct platform_device *pdev)
		struct msm_pinctrl *pctrl = platform_get_drvdata(pdev);

		gpiochip_remove(&pctrl->chip);
		pinctrl_unregister(pctrl->pctrl);

		unregister_restart_handler(&pctrl->restart_nb);

Admin message