]> git.karo-electronics.de Git - linux-beck.git/commitdiff
pinctrl: adi2: Use devm_pinctrl_register() for pinctrl registration
authorLaxman Dewangan <ldewangan@nvidia.com>
Wed, 24 Feb 2016 09:14:07 +0000 (14:44 +0530)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 21 Apr 2016 07:23:20 +0000 (09:23 +0200)
Use devm_pinctrl_register() for pin control registration and remove
the need of .remove callback.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-adi2.c

index ecb57635a37ea6e4bc833b5684e4459f7a555972..54569a7eac59179a42495b3a140fa5fa261ab438 100644 (file)
@@ -1058,7 +1058,8 @@ static int adi_pinctrl_probe(struct platform_device *pdev)
        adi_pinmux_desc.npins = pinctrl->soc->npins;
 
        /* Now register the pin controller and all pins it handles */
-       pinctrl->pctl = pinctrl_register(&adi_pinmux_desc, &pdev->dev, pinctrl);
+       pinctrl->pctl = devm_pinctrl_register(&pdev->dev, &adi_pinmux_desc,
+                                             pinctrl);
        if (IS_ERR(pinctrl->pctl)) {
                dev_err(&pdev->dev, "could not register pinctrl ADI2 driver\n");
                return PTR_ERR(pinctrl->pctl);
@@ -1069,18 +1070,8 @@ static int adi_pinctrl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int adi_pinctrl_remove(struct platform_device *pdev)
-{
-       struct adi_pinctrl *pinctrl = platform_get_drvdata(pdev);
-
-       pinctrl_unregister(pinctrl->pctl);
-
-       return 0;
-}
-
 static struct platform_driver adi_pinctrl_driver = {
        .probe          = adi_pinctrl_probe,
-       .remove         = adi_pinctrl_remove,
        .driver         = {
                .name   = DRIVER_NAME,
        },