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

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
...@@ -635,7 +635,7 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, ...@@ -635,7 +635,7 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev,
ipctl->info = info; ipctl->info = info;
ipctl->dev = info->dev; ipctl->dev = info->dev;
platform_set_drvdata(pdev, ipctl); 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)) { if (IS_ERR(ipctl->pctl)) {
dev_err(&pdev->dev, "could not register IMX pinctrl driver\n"); dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");
return PTR_ERR(ipctl->pctl); return PTR_ERR(ipctl->pctl);
...@@ -652,12 +652,3 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, ...@@ -652,12 +652,3 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev,
return 0; 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;
}
...@@ -269,7 +269,6 @@ static struct platform_driver imx1_pinctrl_driver = { ...@@ -269,7 +269,6 @@ static struct platform_driver imx1_pinctrl_driver = {
.name = "imx1-pinctrl", .name = "imx1-pinctrl",
.of_match_table = imx1_pinctrl_of_match, .of_match_table = imx1_pinctrl_of_match,
}, },
.remove = imx1_pinctrl_core_remove,
}; };
module_platform_driver_probe(imx1_pinctrl_driver, imx1_pinctrl_probe); module_platform_driver_probe(imx1_pinctrl_driver, imx1_pinctrl_probe);
......
...@@ -69,5 +69,4 @@ struct imx1_pinctrl_soc_info { ...@@ -69,5 +69,4 @@ struct imx1_pinctrl_soc_info {
int imx1_pinctrl_core_probe(struct platform_device *pdev, int imx1_pinctrl_core_probe(struct platform_device *pdev,
struct imx1_pinctrl_soc_info *info); struct imx1_pinctrl_soc_info *info);
int imx1_pinctrl_core_remove(struct platform_device *pdev);
#endif /* __DRIVERS_PINCTRL_IMX1_H */ #endif /* __DRIVERS_PINCTRL_IMX1_H */
...@@ -332,7 +332,6 @@ static struct platform_driver imx21_pinctrl_driver = { ...@@ -332,7 +332,6 @@ static struct platform_driver imx21_pinctrl_driver = {
.name = "imx21-pinctrl", .name = "imx21-pinctrl",
.of_match_table = imx21_pinctrl_of_match, .of_match_table = imx21_pinctrl_of_match,
}, },
.remove = imx1_pinctrl_core_remove,
}; };
module_platform_driver_probe(imx21_pinctrl_driver, imx21_pinctrl_probe); module_platform_driver_probe(imx21_pinctrl_driver, imx21_pinctrl_probe);
......
...@@ -405,7 +405,6 @@ static struct platform_driver imx27_pinctrl_driver = { ...@@ -405,7 +405,6 @@ static struct platform_driver imx27_pinctrl_driver = {
.of_match_table = of_match_ptr(imx27_pinctrl_of_match), .of_match_table = of_match_ptr(imx27_pinctrl_of_match),
}, },
.probe = imx27_pinctrl_probe, .probe = imx27_pinctrl_probe,
.remove = imx1_pinctrl_core_remove,
}; };
static int __init imx27_pinctrl_init(void) static int __init imx27_pinctrl_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment