pwm: imx-tpm: Simplify using devm functions

With devm_clk_get_enabled() the call to clk_disable_unprepare() can be
dropped from the error path and the remove callback. With
devm_pwmchip_add() pwmchip_remove() can be dropped. Then the remove
callback is empty and can go away, too.

Also use dev_err_probe() for simplified (and improved) error reporting.

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Thierry Reding <[email protected]>

diff --git a/drivers/pwm/pwm-imx-tpm.c b/drivers/pwm/pwm-imx-tpm.c
index fe8bf598d388956bceda07439f6901569fe3f851..dc6aafeb9f7b44eb976cb89edbaf965fb648723a 100644 (file)
--- a/drivers/pwm/pwm-imx-tpm.c
+++ b/drivers/pwm/pwm-imx-tpm.c
@@ -350,18 +350,11 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev)
        if (IS_ERR(tpm->base))
                return PTR_ERR(tpm->base);
 
-       tpm->clk = devm_clk_get(&pdev->dev, NULL);
+       tpm->clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(tpm->clk))
                return dev_err_probe(&pdev->dev, PTR_ERR(tpm->clk),
                                     "failed to get PWM clock\n");
 
-       ret = clk_prepare_enable(tpm->clk);
-       if (ret) {
-               dev_err(&pdev->dev,
-                       "failed to prepare or enable clock: %d\n", ret);
-               return ret;
-       }
-
        tpm->chip.dev = &pdev->dev;
        tpm->chip.ops = &imx_tpm_pwm_ops;
 
@@ -371,22 +364,11 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev)
 
        mutex_init(&tpm->lock);
 
-       ret = pwmchip_add(&tpm->chip);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
-               clk_disable_unprepare(tpm->clk);
-       }
-
-       return ret;
-}
-
-static void pwm_imx_tpm_remove(struct platform_device *pdev)
-{
-       struct imx_tpm_pwm_chip *tpm = platform_get_drvdata(pdev);
-
-       pwmchip_remove(&tpm->chip);
+       ret = devm_pwmchip_add(&pdev->dev, &tpm->chip);
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n");
 
-       clk_disable_unprepare(tpm->clk);
+       return 0;
 }
 
 static int __maybe_unused pwm_imx_tpm_suspend(struct device *dev)
@@ -436,7 +418,6 @@ static struct platform_driver imx_tpm_pwm_driver = {
                .pm = &imx_tpm_pwm_pm,
        },
        .probe  = pwm_imx_tpm_probe,
-       .remove_new = pwm_imx_tpm_remove,
 };
 module_platform_driver(imx_tpm_pwm_driver);