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

Commit 5f276f67 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij
Browse files

pinctrl: bcm2835: Use devm_pinctrl_register() for pinctrl registration 



Use devm_pinctrl_register() for pin control registration.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: bcm-kernel-feedback-list@broadcom.com
Acked-by: default avatarRay Jui <ray.jui@broadcom.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7f5567aa

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+1 −2
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) 
		return err;

	}



	pc->pctl_dev = pinctrl_register(&bcm2835_pinctrl_desc, dev, pc);

	pc->pctl_dev = devm_pinctrl_register(dev, &bcm2835_pinctrl_desc, pc);

	if (IS_ERR(pc->pctl_dev)) {

		gpiochip_remove(&pc->gpio_chip);

		return PTR_ERR(pc->pctl_dev);
@@ -1058,7 +1058,6 @@ static int bcm2835_pinctrl_remove(struct platform_device *pdev) 
{

	struct bcm2835_pinctrl *pc = platform_get_drvdata(pdev);



	pinctrl_unregister(pc->pctl_dev);

	gpiochip_remove(&pc->gpio_chip);



	return 0;