pinctrl: zynq: Use devm_pinctrl_register() for pinctrl registration

Use devm_pinctrl_register() for pin control registration and
remove the need of .remove callback.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 21df52e..98d2a1b 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1883,7 +1883,7 @@ static int devm_pinctrl_dev_match(struct device *dev, void *res, void *data)
 {
        struct pctldev **r = res;
 
-       if (WARN_ON(!r || !*r)
+       if (WARN_ON(!r || !*r))
                return 0;
 
        return *r == data;

diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c
index 3f1b55f..8fdc60c 100644 (file)
--- a/drivers/pinctrl/pinctrl-zynq.c
+++ b/drivers/pinctrl/pinctrl-zynq.c
@@ -1195,7 +1195,7 @@ static int zynq_pinctrl_probe(struct platform_device *pdev)
        pctrl->funcs = zynq_pmux_functions;
        pctrl->nfuncs = ARRAY_SIZE(zynq_pmux_functions);
 
-       pctrl->pctrl = pinctrl_register(&zynq_desc, &pdev->dev, pctrl);
+       pctrl->pctrl = devm_pinctrl_register(&pdev->dev, &zynq_desc, pctrl);
        if (IS_ERR(pctrl->pctrl))
                return PTR_ERR(pctrl->pctrl);
 
@@ -1206,15 +1206,6 @@ static int zynq_pinctrl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int zynq_pinctrl_remove(struct platform_device *pdev)
-{
-       struct zynq_pinctrl *pctrl = platform_get_drvdata(pdev);
-
-       pinctrl_unregister(pctrl->pctrl);
-
-       return 0;
-}
-
 static const struct of_device_id zynq_pinctrl_of_match[] = {
        { .compatible = "xlnx,pinctrl-zynq" },
        { }
@@ -1227,7 +1218,6 @@ static struct platform_driver zynq_pinctrl_driver = {
                .of_match_table = zynq_pinctrl_of_match,
        },
        .probe = zynq_pinctrl_probe,
-       .remove = zynq_pinctrl_remove,
 };
 
 static int __init zynq_pinctrl_init(void)