pinctrl: spear: Use devm_pinctrl_register() for pinctrl registration

[mirror_ubuntu-artful-kernel.git] / drivers / pinctrl / spear / pinctrl-spear.c

diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index 0afaf79a4e5175f99233726d07ea086758e72623..4db52ba38d8d3f8ca92cb3d12f780b18b4d0a794 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -395,7 +395,7 @@ int spear_pinctrl_probe(struct platform_device *pdev,
        spear_pinctrl_desc.pins = machdata->pins;
        spear_pinctrl_desc.npins = machdata->npins;
 
-       pmx->pctl = pinctrl_register(&spear_pinctrl_desc, &pdev->dev, pmx);
+       pmx->pctl = devm_pinctrl_register(&pdev->dev, &spear_pinctrl_desc, pmx);
        if (IS_ERR(pmx->pctl)) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
                return PTR_ERR(pmx->pctl);
@@ -403,12 +403,3 @@ int spear_pinctrl_probe(struct platform_device *pdev,
 
        return 0;
 }
-
-int spear_pinctrl_remove(struct platform_device *pdev)
-{
-       struct spear_pmx *pmx = platform_get_drvdata(pdev);
-
-       pinctrl_unregister(pmx->pctl);
-
-       return 0;
-}