Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d46cd7 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij
Browse files

pinctrl: intel: Use devm_pinctrl_register() for pinctrl registration 



Use devm_pinctrl_register() for pin control registration and clean
error path.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7cf061fa

drivers/pinctrl/intel/pinctrl-intel.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -1014,17 +1014,16 @@ int intel_pinctrl_probe(struct platform_device *pdev, 
	pctrl->pctldesc.pins = pctrl->soc->pins;

	pctrl->pctldesc.pins = pctrl->soc->pins;

	pctrl->pctldesc.npins = pctrl->soc->npins;

	pctrl->pctldesc.npins = pctrl->soc->npins;





	pctrl->pctldev = pinctrl_register(&pctrl->pctldesc, &pdev->dev, pctrl);

	pctrl->pctldev = devm_pinctrl_register(&pdev->dev, &pctrl->pctldesc,

					       pctrl);

	if (IS_ERR(pctrl->pctldev)) {

	if (IS_ERR(pctrl->pctldev)) {

		dev_err(&pdev->dev, "failed to register pinctrl driver\n");

		dev_err(&pdev->dev, "failed to register pinctrl driver\n");

		return PTR_ERR(pctrl->pctldev);

		return PTR_ERR(pctrl->pctldev);

	}

	}





	ret = intel_gpio_probe(pctrl, irq);

	ret = intel_gpio_probe(pctrl, irq);

	if (ret) {

	if (ret)

		pinctrl_unregister(pctrl->pctldev);

		return ret;

		return ret;

	}





	platform_set_drvdata(pdev, pctrl);

	platform_set_drvdata(pdev, pctrl);
@@ -1037,7 +1036,6 @@ int intel_pinctrl_remove(struct platform_device *pdev) 
	struct intel_pinctrl *pctrl = platform_get_drvdata(pdev);

	struct intel_pinctrl *pctrl = platform_get_drvdata(pdev);





	gpiochip_remove(&pctrl->chip);

	gpiochip_remove(&pctrl->chip);

	pinctrl_unregister(pctrl->pctldev);





	return 0;

	return 0;

}

}