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

Commit 3024f920 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij
Browse files

pinctrl: zynq: Use devm_pinctrl_register() for pinctrl registration 



Use devm_pinctrl_register() for pin control registration and
remove the need of .remove callback.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: default avatarSören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6ac47fd2

drivers/pinctrl/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1883,7 +1883,7 @@ static int devm_pinctrl_dev_match(struct device *dev, void *res, void *data) 
{

	struct pctldev **r = res;



	if (WARN_ON(!r || !*r)

	if (WARN_ON(!r || !*r))

		return 0;



	return *r == data;

drivers/pinctrl/pinctrl-zynq.c

+1 −11
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ static int zynq_pinctrl_probe(struct platform_device *pdev) 
	pctrl->funcs = zynq_pmux_functions;

	pctrl->nfuncs = ARRAY_SIZE(zynq_pmux_functions);



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

	pctrl->pctrl = devm_pinctrl_register(&pdev->dev, &zynq_desc, pctrl);

	if (IS_ERR(pctrl->pctrl))

		return PTR_ERR(pctrl->pctrl);
@@ -1206,15 +1206,6 @@ static int zynq_pinctrl_probe(struct platform_device *pdev) 
	return 0;

}



static int zynq_pinctrl_remove(struct platform_device *pdev)

{

	struct zynq_pinctrl *pctrl = platform_get_drvdata(pdev);



	pinctrl_unregister(pctrl->pctrl);



	return 0;

}



static const struct of_device_id zynq_pinctrl_of_match[] = {

	{ .compatible = "xlnx,pinctrl-zynq" },

	{ }
@@ -1227,7 +1218,6 @@ static struct platform_driver zynq_pinctrl_driver = { 
		.of_match_table = zynq_pinctrl_of_match,

	},

	.probe = zynq_pinctrl_probe,

	.remove = zynq_pinctrl_remove,

};



static int __init zynq_pinctrl_init(void)