diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-12-07 18:13:16 +0100 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2013-12-12 13:23:23 +0100 |
| commit | 0dc1135fdf5e2b2a3dbacd59c66f3e9236894425 (patch) | |
| tree | 1d2308bc488e24256d8384b83ed0935077153f2c /drivers/pwm | |
| parent | 078c6ac1bd83654df62ea5914f98093e1f764320 (diff) | |
| download | linux-0dc1135fdf5e2b2a3dbacd59c66f3e9236894425.tar.gz linux-0dc1135fdf5e2b2a3dbacd59c66f3e9236894425.tar.bz2 linux-0dc1135fdf5e2b2a3dbacd59c66f3e9236894425.zip | |
pwm: jz4740: Use devm_clk_get()
Using the managed version of clk_get() makes the code a bit shorter and the
error paths less complicated.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/pwm-jz4740.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c index a44d890c3818..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(&pdev->dev, "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 = { |