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

Commit 00b881b0 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij
Browse files

pinctrl: tz1090-pdc: 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>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c3a6d9e0

drivers/pinctrl/pinctrl-tz1090-pdc.c

+2 −11
Original line number Original line Diff line number Diff line
@@ -947,7 +947,8 @@ static int tz1090_pdc_pinctrl_probe(struct platform_device *pdev) 
	if (IS_ERR(pmx->regs))

	if (IS_ERR(pmx->regs))

		return PTR_ERR(pmx->regs);

		return PTR_ERR(pmx->regs);





	pmx->pctl = pinctrl_register(&tz1090_pdc_pinctrl_desc, &pdev->dev, pmx);

	pmx->pctl = devm_pinctrl_register(&pdev->dev, &tz1090_pdc_pinctrl_desc,

					  pmx);

	if (IS_ERR(pmx->pctl)) {

	if (IS_ERR(pmx->pctl)) {

		dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");

		dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");

		return PTR_ERR(pmx->pctl);

		return PTR_ERR(pmx->pctl);
@@ -960,15 +961,6 @@ static int tz1090_pdc_pinctrl_probe(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





static int tz1090_pdc_pinctrl_remove(struct platform_device *pdev)

{

	struct tz1090_pdc_pmx *pmx = platform_get_drvdata(pdev);



	pinctrl_unregister(pmx->pctl);



	return 0;

}



static const struct of_device_id tz1090_pdc_pinctrl_of_match[] = {

static const struct of_device_id tz1090_pdc_pinctrl_of_match[] = {

	{ .compatible = "img,tz1090-pdc-pinctrl", },

	{ .compatible = "img,tz1090-pdc-pinctrl", },

	{ },

	{ },
@@ -980,7 +972,6 @@ static struct platform_driver tz1090_pdc_pinctrl_driver = { 
		.of_match_table	= tz1090_pdc_pinctrl_of_match,

		.of_match_table	= tz1090_pdc_pinctrl_of_match,

	},

	},

	.probe	= tz1090_pdc_pinctrl_probe,

	.probe	= tz1090_pdc_pinctrl_probe,

	.remove	= tz1090_pdc_pinctrl_remove,

};

};





static int __init tz1090_pdc_pinctrl_init(void)

static int __init tz1090_pdc_pinctrl_init(void)