Merge branch 'for-6.8/mcp2221' into for-linus

[linux-2.6-microblaze.git] / drivers / pwm / pwm-bcm-iproc.c

diff --git a/drivers/pwm/pwm-bcm-iproc.c b/drivers/pwm/pwm-bcm-iproc.c
index 7d70b6f..7582540 100644 (file)
--- a/drivers/pwm/pwm-bcm-iproc.c
+++ b/drivers/pwm/pwm-bcm-iproc.c
@@ -183,7 +183,6 @@ static int iproc_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 static const struct pwm_ops iproc_pwm_ops = {
        .apply = iproc_pwmc_apply,
        .get_state = iproc_pwmc_get_state,
-       .owner = THIS_MODULE,
 };
 
 static int iproc_pwmc_probe(struct platform_device *pdev)
@@ -207,18 +206,10 @@ static int iproc_pwmc_probe(struct platform_device *pdev)
        if (IS_ERR(ip->base))
                return PTR_ERR(ip->base);
 
-       ip->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(ip->clk)) {
-               dev_err(&pdev->dev, "failed to get clock: %ld\n",
-                       PTR_ERR(ip->clk));
-               return PTR_ERR(ip->clk);
-       }
-
-       ret = clk_prepare_enable(ip->clk);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to enable clock: %d\n", ret);
-               return ret;
-       }
+       ip->clk = devm_clk_get_enabled(&pdev->dev, NULL);
+       if (IS_ERR(ip->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(ip->clk),
+                                    "failed to get clock\n");
 
        /* Set full drive and normal polarity for all channels */
        value = readl(ip->base + IPROC_PWM_CTRL_OFFSET);
@@ -230,22 +221,12 @@ static int iproc_pwmc_probe(struct platform_device *pdev)
 
        writel(value, ip->base + IPROC_PWM_CTRL_OFFSET);
 
-       ret = pwmchip_add(&ip->chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
-               clk_disable_unprepare(ip->clk);
-       }
-
-       return ret;
-}
-
-static void iproc_pwmc_remove(struct platform_device *pdev)
-{
-       struct iproc_pwmc *ip = platform_get_drvdata(pdev);
+       ret = devm_pwmchip_add(&pdev->dev, &ip->chip);
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "failed to add PWM chip\n");
 
-       pwmchip_remove(&ip->chip);
-
-       clk_disable_unprepare(ip->clk);
+       return 0;
 }
 
 static const struct of_device_id bcm_iproc_pwmc_dt[] = {
@@ -260,7 +241,6 @@ static struct platform_driver iproc_pwmc_driver = {
                .of_match_table = bcm_iproc_pwmc_dt,
        },
        .probe = iproc_pwmc_probe,
-       .remove_new = iproc_pwmc_remove,
 };
 module_platform_driver(iproc_pwmc_driver);