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

pinctrl: tegra: 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: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 45078ea0
...@@ -735,7 +735,7 @@ int tegra_pinctrl_probe(struct platform_device *pdev, ...@@ -735,7 +735,7 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
return PTR_ERR(pmx->regs[i]); return PTR_ERR(pmx->regs[i]);
} }
pmx->pctl = pinctrl_register(&tegra_pinctrl_desc, &pdev->dev, pmx); pmx->pctl = devm_pinctrl_register(&pdev->dev, &tegra_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);
...@@ -753,13 +753,3 @@ int tegra_pinctrl_probe(struct platform_device *pdev, ...@@ -753,13 +753,3 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(tegra_pinctrl_probe); EXPORT_SYMBOL_GPL(tegra_pinctrl_probe);
int tegra_pinctrl_remove(struct platform_device *pdev)
{
struct tegra_pmx *pmx = platform_get_drvdata(pdev);
pinctrl_unregister(pmx->pctl);
return 0;
}
EXPORT_SYMBOL_GPL(tegra_pinctrl_remove);
...@@ -195,6 +195,4 @@ struct tegra_pinctrl_soc_data { ...@@ -195,6 +195,4 @@ struct tegra_pinctrl_soc_data {
int tegra_pinctrl_probe(struct platform_device *pdev, int tegra_pinctrl_probe(struct platform_device *pdev,
const struct tegra_pinctrl_soc_data *soc_data); const struct tegra_pinctrl_soc_data *soc_data);
int tegra_pinctrl_remove(struct platform_device *pdev);
#endif #endif
...@@ -1865,7 +1865,6 @@ static struct platform_driver tegra114_pinctrl_driver = { ...@@ -1865,7 +1865,6 @@ static struct platform_driver tegra114_pinctrl_driver = {
.of_match_table = tegra114_pinctrl_of_match, .of_match_table = tegra114_pinctrl_of_match,
}, },
.probe = tegra114_pinctrl_probe, .probe = tegra114_pinctrl_probe,
.remove = tegra_pinctrl_remove,
}; };
module_platform_driver(tegra114_pinctrl_driver); module_platform_driver(tegra114_pinctrl_driver);
......
...@@ -2077,7 +2077,6 @@ static struct platform_driver tegra124_pinctrl_driver = { ...@@ -2077,7 +2077,6 @@ static struct platform_driver tegra124_pinctrl_driver = {
.of_match_table = tegra124_pinctrl_of_match, .of_match_table = tegra124_pinctrl_of_match,
}, },
.probe = tegra124_pinctrl_probe, .probe = tegra124_pinctrl_probe,
.remove = tegra_pinctrl_remove,
}; };
module_platform_driver(tegra124_pinctrl_driver); module_platform_driver(tegra124_pinctrl_driver);
......
...@@ -2245,7 +2245,6 @@ static struct platform_driver tegra20_pinctrl_driver = { ...@@ -2245,7 +2245,6 @@ static struct platform_driver tegra20_pinctrl_driver = {
.of_match_table = tegra20_pinctrl_of_match, .of_match_table = tegra20_pinctrl_of_match,
}, },
.probe = tegra20_pinctrl_probe, .probe = tegra20_pinctrl_probe,
.remove = tegra_pinctrl_remove,
}; };
module_platform_driver(tegra20_pinctrl_driver); module_platform_driver(tegra20_pinctrl_driver);
......
...@@ -1583,7 +1583,6 @@ static struct platform_driver tegra210_pinctrl_driver = { ...@@ -1583,7 +1583,6 @@ static struct platform_driver tegra210_pinctrl_driver = {
.of_match_table = tegra210_pinctrl_of_match, .of_match_table = tegra210_pinctrl_of_match,
}, },
.probe = tegra210_pinctrl_probe, .probe = tegra210_pinctrl_probe,
.remove = tegra_pinctrl_remove,
}; };
module_platform_driver(tegra210_pinctrl_driver); module_platform_driver(tegra210_pinctrl_driver);
......
...@@ -2500,7 +2500,6 @@ static struct platform_driver tegra30_pinctrl_driver = { ...@@ -2500,7 +2500,6 @@ static struct platform_driver tegra30_pinctrl_driver = {
.of_match_table = tegra30_pinctrl_of_match, .of_match_table = tegra30_pinctrl_of_match,
}, },
.probe = tegra30_pinctrl_probe, .probe = tegra30_pinctrl_probe,
.remove = tegra_pinctrl_remove,
}; };
module_platform_driver(tegra30_pinctrl_driver); module_platform_driver(tegra30_pinctrl_driver);
......
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