mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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: Laxman Dewangan <[email protected]> Cc: Bjorn Andersson <[email protected]> Reviewed-by: Bjorn Andersson <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
This commit is contained in:
parent
16f3b9c3a5
commit
5f5e111af6
1 changed files with 2 additions and 7 deletions
|
|
@ -820,7 +820,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
|
|||
pctrl->desc.custom_conf_items = pm8xxx_conf_items;
|
||||
#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)) {
|
||||
dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n");
|
||||
return PTR_ERR(pctrl->pctrl);
|
||||
|
|
@ -836,7 +836,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
|
|||
ret = gpiochip_add_data(&pctrl->chip, pctrl);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed register gpiochip\n");
|
||||
goto unregister_pinctrl;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = gpiochip_add_pin_range(&pctrl->chip,
|
||||
|
|
@ -856,9 +856,6 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
|
|||
unregister_gpiochip:
|
||||
gpiochip_remove(&pctrl->chip);
|
||||
|
||||
unregister_pinctrl:
|
||||
pinctrl_unregister(pctrl->pctrl);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -868,8 +865,6 @@ static int pm8xxx_mpp_remove(struct platform_device *pdev)
|
|||
|
||||
gpiochip_remove(&pctrl->chip);
|
||||
|
||||
pinctrl_unregister(pctrl->pctrl);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue