Skip to content

Commit 2aca5c5

Browse files
metiulekmkrzk
authored andcommitted
pinctrl: samsung: defer pinctrl_enable
dev_pinctrl_register function immediately enables the pinctrl subsystem, which is unpreferable in general, since drivers might be unable to handle calls immediately. Hence devm_pinctrl_register_and_init, which does not call pinctrl_enable, is preferred. In case of our driver using the old function does not seem to be problematic for now, but will become an issue when we postpone parts of pinctrl initialization in a future commit, and it is a good idea to move off a deprecated-ish function anyway. Signed-off-by: Mateusz Majewski <m.majewski2@samsung.com> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> Tested-by: Sam Protsenko <semen.protsenko@linaro.org> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20231006125557.212681-2-m.majewski2@samsung.com Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent 4e1e211 commit 2aca5c5

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

drivers/pinctrl/samsung/pinctrl-samsung.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,11 +904,11 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
904904
if (ret)
905905
return ret;
906906

907-
drvdata->pctl_dev = devm_pinctrl_register(&pdev->dev, ctrldesc,
908-
drvdata);
909-
if (IS_ERR(drvdata->pctl_dev)) {
907+
ret = devm_pinctrl_register_and_init(&pdev->dev, ctrldesc, drvdata,
908+
&drvdata->pctl_dev);
909+
if (ret) {
910910
dev_err(&pdev->dev, "could not register pinctrl driver\n");
911-
return PTR_ERR(drvdata->pctl_dev);
911+
return ret;
912912
}
913913

914914
for (bank = 0; bank < drvdata->nr_banks; ++bank) {
@@ -1176,6 +1176,10 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
11761176
if (ret)
11771177
goto err_unregister;
11781178

1179+
ret = pinctrl_enable(drvdata->pctl_dev);
1180+
if (ret)
1181+
goto err_unregister;
1182+
11791183
platform_set_drvdata(pdev, drvdata);
11801184

11811185
return 0;

0 commit comments

Comments
 (0)