pinctrl: samsung: defer pinctrl_enable
authorMateusz Majewski <m.majewski2@samsung.com>
Fri, 6 Oct 2023 12:55:54 +0000 (14:55 +0200)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 9 Oct 2023 10:37:20 +0000 (12:37 +0200)
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>
drivers/pinctrl/samsung/pinctrl-samsung.c

index e54847040b4a92b40284c3e7e29531976c40bf96..e496af72a587664eee12ad2095718032a79868a8 100644 (file)
@@ -904,11 +904,11 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
        if (ret)
                return ret;
 
-       drvdata->pctl_dev = devm_pinctrl_register(&pdev->dev, ctrldesc,
-                                                 drvdata);
-       if (IS_ERR(drvdata->pctl_dev)) {
+       ret = devm_pinctrl_register_and_init(&pdev->dev, ctrldesc, drvdata,
+                                            &drvdata->pctl_dev);
+       if (ret) {
                dev_err(&pdev->dev, "could not register pinctrl driver\n");
-               return PTR_ERR(drvdata->pctl_dev);
+               return ret;
        }
 
        for (bank = 0; bank < drvdata->nr_banks; ++bank) {
@@ -1176,6 +1176,10 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
        if (ret)
                goto err_unregister;
 
+       ret = pinctrl_enable(drvdata->pctl_dev);
+       if (ret)
+               goto err_unregister;
+
        platform_set_drvdata(pdev, drvdata);
 
        return 0;