Commit 5f5e111a authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij

pinctrl: ssbi-mpp: Use devm_pinctrl_register() for pinctrl registration

Use devm_pinctrl_register() for pin control registration and clean
the error path.
Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 16f3b9c3
...@@ -820,7 +820,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev) ...@@ -820,7 +820,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
pctrl->desc.custom_conf_items = pm8xxx_conf_items; pctrl->desc.custom_conf_items = pm8xxx_conf_items;
#endif #endif
pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl); pctrl->pctrl = devm_pinctrl_register(&pdev->dev, &pctrl->desc, pctrl);
if (IS_ERR(pctrl->pctrl)) { if (IS_ERR(pctrl->pctrl)) {
dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n"); dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n");
return PTR_ERR(pctrl->pctrl); return PTR_ERR(pctrl->pctrl);
...@@ -836,7 +836,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev) ...@@ -836,7 +836,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
ret = gpiochip_add_data(&pctrl->chip, pctrl); ret = gpiochip_add_data(&pctrl->chip, pctrl);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed register gpiochip\n"); dev_err(&pdev->dev, "failed register gpiochip\n");
goto unregister_pinctrl; return ret;
} }
ret = gpiochip_add_pin_range(&pctrl->chip, ret = gpiochip_add_pin_range(&pctrl->chip,
...@@ -856,9 +856,6 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev) ...@@ -856,9 +856,6 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
unregister_gpiochip: unregister_gpiochip:
gpiochip_remove(&pctrl->chip); gpiochip_remove(&pctrl->chip);
unregister_pinctrl:
pinctrl_unregister(pctrl->pctrl);
return ret; return ret;
} }
...@@ -868,8 +865,6 @@ static int pm8xxx_mpp_remove(struct platform_device *pdev) ...@@ -868,8 +865,6 @@ static int pm8xxx_mpp_remove(struct platform_device *pdev)
gpiochip_remove(&pctrl->chip); gpiochip_remove(&pctrl->chip);
pinctrl_unregister(pctrl->pctrl);
return 0; return 0;
} }
......
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