aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2016-02-24 04:14:07 -0500
committerLinus Walleij <linus.walleij@linaro.org>2016-04-20 18:02:13 -0400
commit7e73f819054c5da0203a4faf446c9776a4ca0f75 (patch)
treeab06af6d016aa32bcd8fe1563acd74063a492fad
parent315d118f1ac5b6132b604f69e1281cf7fa83594f (diff)
pinctrl: berlin: Use devm_pinctrl_register() for pinctrl registration
Use devm_pinctrl_register() for pin control registration. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Cc: Antoine Ténart <antoine.tenart@free-electrons.com> Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/berlin/berlin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c
index 87b17b77df02..8f0dc02f7624 100644
--- a/drivers/pinctrl/berlin/berlin.c
+++ b/drivers/pinctrl/berlin/berlin.c
@@ -316,7 +316,8 @@ int berlin_pinctrl_probe_regmap(struct platform_device *pdev,
316 return ret; 316 return ret;
317 } 317 }
318 318
319 pctrl->pctrl_dev = pinctrl_register(&berlin_pctrl_desc, dev, pctrl); 319 pctrl->pctrl_dev = devm_pinctrl_register(dev, &berlin_pctrl_desc,
320 pctrl);
320 if (IS_ERR(pctrl->pctrl_dev)) { 321 if (IS_ERR(pctrl->pctrl_dev)) {
321 dev_err(dev, "failed to register pinctrl driver\n"); 322 dev_err(dev, "failed to register pinctrl driver\n");
322 return PTR_ERR(pctrl->pctrl_dev); 323 return PTR_ERR(pctrl->pctrl_dev);