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

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

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: default avatarLaxman 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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a4b0f457

drivers/pinctrl/freescale/pinctrl-imx1-core.c

+1 −10
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, 
	ipctl->info = info;

	ipctl->dev = info->dev;

	platform_set_drvdata(pdev, ipctl);

	ipctl->pctl = pinctrl_register(pctl_desc, &pdev->dev, ipctl);

	ipctl->pctl = devm_pinctrl_register(&pdev->dev, pctl_desc, ipctl);

	if (IS_ERR(ipctl->pctl)) {

		dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");

		return PTR_ERR(ipctl->pctl);
@@ -652,12 +652,3 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, 


	return 0;

}
 


int imx1_pinctrl_core_remove(struct platform_device *pdev)

{

	struct imx1_pinctrl *ipctl = platform_get_drvdata(pdev);



	pinctrl_unregister(ipctl->pctl);



	return 0;

}

drivers/pinctrl/freescale/pinctrl-imx1.c

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static struct platform_driver imx1_pinctrl_driver = { 
		.name		= "imx1-pinctrl",

		.of_match_table	= imx1_pinctrl_of_match,

	},

	.remove	= imx1_pinctrl_core_remove,

};

module_platform_driver_probe(imx1_pinctrl_driver, imx1_pinctrl_probe);

drivers/pinctrl/freescale/pinctrl-imx1.h

+0 −1
Original line number Diff line number Diff line
@@ -69,5 +69,4 @@ struct imx1_pinctrl_soc_info { 


int imx1_pinctrl_core_probe(struct platform_device *pdev,

			struct imx1_pinctrl_soc_info *info);

int imx1_pinctrl_core_remove(struct platform_device *pdev);

#endif /* __DRIVERS_PINCTRL_IMX1_H */

drivers/pinctrl/freescale/pinctrl-imx21.c

+0 −1
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ static struct platform_driver imx21_pinctrl_driver = { 
		.name		= "imx21-pinctrl",

		.of_match_table	= imx21_pinctrl_of_match,

	},

	.remove	= imx1_pinctrl_core_remove,

};

module_platform_driver_probe(imx21_pinctrl_driver, imx21_pinctrl_probe);

drivers/pinctrl/freescale/pinctrl-imx27.c

+0 −1
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static struct platform_driver imx27_pinctrl_driver = { 
		.of_match_table = of_match_ptr(imx27_pinctrl_of_match),

	},

	.probe = imx27_pinctrl_probe,

	.remove = imx1_pinctrl_core_remove,

};



static int __init imx27_pinctrl_init(void)