Skip to content

Commit

Permalink
pwm: jz4740: Use devm_clk_get()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Thierry Reding committed Dec 12, 2013
1 parent 078c6ac commit 0dc1135
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions drivers/pwm/pwm-jz4740.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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 = {
Expand Down

0 comments on commit 0dc1135

Please sign in to comment.