Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: imxl: Use devm_pinctrl_register() for pinctrl registration

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

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Hongzhou Yang <hongzhou.yang@mediatek.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Laxman Dewangan and committed by
Linus Walleij
e55e025d a4b0f457

+1 -14
+1 -10
drivers/pinctrl/freescale/pinctrl-imx1-core.c
··· 635 635 ipctl->info = info; 636 636 ipctl->dev = info->dev; 637 637 platform_set_drvdata(pdev, ipctl); 638 - ipctl->pctl = pinctrl_register(pctl_desc, &pdev->dev, ipctl); 638 + ipctl->pctl = devm_pinctrl_register(&pdev->dev, pctl_desc, ipctl); 639 639 if (IS_ERR(ipctl->pctl)) { 640 640 dev_err(&pdev->dev, "could not register IMX pinctrl driver\n"); 641 641 return PTR_ERR(ipctl->pctl); ··· 649 649 } 650 650 651 651 dev_info(&pdev->dev, "initialized IMX pinctrl driver\n"); 652 - 653 - return 0; 654 - } 655 - 656 - int imx1_pinctrl_core_remove(struct platform_device *pdev) 657 - { 658 - struct imx1_pinctrl *ipctl = platform_get_drvdata(pdev); 659 - 660 - pinctrl_unregister(ipctl->pctl); 661 652 662 653 return 0; 663 654 }
-1
drivers/pinctrl/freescale/pinctrl-imx1.c
··· 269 269 .name = "imx1-pinctrl", 270 270 .of_match_table = imx1_pinctrl_of_match, 271 271 }, 272 - .remove = imx1_pinctrl_core_remove, 273 272 }; 274 273 module_platform_driver_probe(imx1_pinctrl_driver, imx1_pinctrl_probe); 275 274
-1
drivers/pinctrl/freescale/pinctrl-imx1.h
··· 69 69 70 70 int imx1_pinctrl_core_probe(struct platform_device *pdev, 71 71 struct imx1_pinctrl_soc_info *info); 72 - int imx1_pinctrl_core_remove(struct platform_device *pdev); 73 72 #endif /* __DRIVERS_PINCTRL_IMX1_H */
-1
drivers/pinctrl/freescale/pinctrl-imx21.c
··· 332 332 .name = "imx21-pinctrl", 333 333 .of_match_table = imx21_pinctrl_of_match, 334 334 }, 335 - .remove = imx1_pinctrl_core_remove, 336 335 }; 337 336 module_platform_driver_probe(imx21_pinctrl_driver, imx21_pinctrl_probe); 338 337
-1
drivers/pinctrl/freescale/pinctrl-imx27.c
··· 405 405 .of_match_table = of_match_ptr(imx27_pinctrl_of_match), 406 406 }, 407 407 .probe = imx27_pinctrl_probe, 408 - .remove = imx1_pinctrl_core_remove, 409 408 }; 410 409 411 410 static int __init imx27_pinctrl_init(void)