|
@@ -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,
|
|
|
|
|
|
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;
|
|
|
|
-}
|
|
|