lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pwm: Convert pwm-samsung to use devm_* APIs

Browse Source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
This commit is contained in:
Axel Lin
2012-06-29 21:32:15 +08:00
committed by Thierry Reding
parent 0c8f527d8c
commit 6192fa8744
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pwm/pwm-samsung.c
View File

@@ -1,4 +1,4 @@
/* arch/arm/plat-s3c/pwm.c /* drivers/pwm/pwm-samsung.c
* *
* Copyright (c) 2007 Ben Dooks * Copyright (c) 2007 Ben Dooks
* Copyright (c) 2008 Simtec Electronics * Copyright (c) 2008 Simtec Electronics
@@ -215,7 +215,7 @@ static int s3c_pwm_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
s3c = kzalloc(sizeof(*s3c), GFP_KERNEL); s3c = devm_kzalloc(&pdev->dev, sizeof(*s3c), GFP_KERNEL);
if (s3c == NULL) { if (s3c == NULL) {
dev_err(dev, "failed to allocate pwm_device\n"); dev_err(dev, "failed to allocate pwm_device\n");
return -ENOMEM; return -ENOMEM;
@@ -227,18 +227,16 @@ static int s3c_pwm_probe(struct platform_device *pdev)
s3c->chip.base = -1; s3c->chip.base = -1;
s3c->chip.npwm = 1; s3c->chip.npwm = 1;
s3c->clk = clk_get(dev, "pwm-tin"); s3c->clk = devm_clk_get(dev, "pwm-tin");
if (IS_ERR(s3c->clk)) { if (IS_ERR(s3c->clk)) {
dev_err(dev, "failed to get pwm tin clk\n"); dev_err(dev, "failed to get pwm tin clk\n");
ret = PTR_ERR(s3c->clk); return PTR_ERR(s3c->clk);
goto err_alloc;
} }
s3c->clk_div = clk_get(dev, "pwm-tdiv"); s3c->clk_div = devm_clk_get(dev, "pwm-tdiv");
if (IS_ERR(s3c->clk_div)) { if (IS_ERR(s3c->clk_div)) {
dev_err(dev, "failed to get pwm tdiv clk\n"); dev_err(dev, "failed to get pwm tdiv clk\n");
ret = PTR_ERR(s3c->clk_div); return PTR_ERR(s3c->clk_div);
goto err_clk_tin;
} }
clk_enable(s3c->clk); clk_enable(s3c->clk);
@@ -272,13 +270,6 @@ static int s3c_pwm_probe(struct platform_device *pdev)
err_clk_tdiv: err_clk_tdiv:
clk_disable(s3c->clk_div); clk_disable(s3c->clk_div);
clk_disable(s3c->clk); clk_disable(s3c->clk);
clk_put(s3c->clk_div);
err_clk_tin:
clk_put(s3c->clk);
err_alloc:
kfree(s3c);
return ret; return ret;
} }
@@ -293,9 +284,6 @@ static int __devexit s3c_pwm_remove(struct platform_device *pdev)
clk_disable(s3c->clk_div); clk_disable(s3c->clk_div);
clk_disable(s3c->clk); clk_disable(s3c->clk);
clk_put(s3c->clk_div);
clk_put(s3c->clk);
kfree(s3c);
return 0; return 0;
} }