1 files changed, 3 insertions, 17 deletions

diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c
index 0a2ede3c3932..9c46209e1d02 100644
--- a/drivers/pwm/pwm-jz4740.c
+++ b/drivers/pwm/pwm-jz4740.c
@@ -165,13 +165,12 @@ static const struct pwm_ops jz4740_pwm_ops = {
 static int jz4740_pwm_probe(struct platform_device *pdev)
 {
         struct jz4740_pwm_chip *jz4740;
-        int ret;
 
         jz4740 = devm_kzalloc(&pdev->dev, sizeof(*jz4740), GFP_KERNEL);
         if (!jz4740)
                 return -ENOMEM;
 
-        jz4740->clk = clk_get(NULL, "ext");
+        jz4740->clk = devm_clk_get(&pdev->dev, "ext");
         if (IS_ERR(jz4740->clk))
                 return PTR_ERR(jz4740->clk);
 
@@ -180,29 +179,16 @@ static int jz4740_pwm_probe(struct platform_device *pdev)
         jz4740->chip.npwm = NUM_PWM;
         jz4740->chip.base = -1;
 
-        ret = pwmchip_add(&jz4740->chip);
-        if (ret < 0) {
-                clk_put(jz4740->clk);
-                return ret;
-        }
-
         platform_set_drvdata(pdev, jz4740);
 
-        return 0;
+        return pwmchip_add(&jz4740->chip);
 }
 
 static int jz4740_pwm_remove(struct platform_device *pdev)
 {
         struct jz4740_pwm_chip *jz4740 = platform_get_drvdata(pdev);
-        int ret;
-
-        ret = pwmchip_remove(&jz4740->chip);
-        if (ret < 0)
-                return ret;
 
-        clk_put(jz4740->clk);
-
-        return 0;
+        return pwmchip_remove(&jz4740->chip);
 }
 
 static struct platform_driver jz4740_pwm_driver = {