lkml.org 
[lkml]   [2012]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5/6] unicore32: pwm: Use managed resource allocations
Date
This commit uses the managed resource allocation functions to simplify
the cleanup paths on error and removal.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
arch/unicore32/kernel/pwm.c | 47 +++++++++------------------------------------
1 file changed, 9 insertions(+), 38 deletions(-)
diff --git a/arch/unicore32/kernel/pwm.c b/arch/unicore32/kernel/pwm.c
index d0cdfc0..795c1ba 100644
--- a/arch/unicore32/kernel/pwm.c
+++ b/arch/unicore32/kernel/pwm.c
@@ -164,19 +164,17 @@ static int __devinit pwm_probe(struct platform_device *pdev)
{
struct pwm_device *pwm;
struct resource *r;
- int ret = 0;

- pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL);
+ pwm = devm_kzalloc(&pdev->dev, sizeof(struct pwm_device), GFP_KERNEL);
if (pwm == NULL) {
dev_err(&pdev->dev, "failed to allocate memory\n");
return -ENOMEM;
}

- pwm->clk = clk_get(NULL, "OST_CLK");
- if (IS_ERR(pwm->clk)) {
- ret = PTR_ERR(pwm->clk);
- goto err_free;
- }
+ pwm->clk = devm_clk_get(&pdev->dev, "OST_CLK");
+ if (IS_ERR(pwm->clk))
+ return PTR_ERR(pwm->clk);
+
pwm->clk_enabled = 0;

pwm->use_count = 0;
@@ -186,41 +184,21 @@ static int __devinit pwm_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (r == NULL) {
dev_err(&pdev->dev, "no memory resource defined\n");
- ret = -ENODEV;
- goto err_free_clk;
- }
-
- r = request_mem_region(r->start, resource_size(r), pdev->name);
- if (r == NULL) {
- dev_err(&pdev->dev, "failed to request memory resource\n");
- ret = -EBUSY;
- goto err_free_clk;
+ return -ENODEV;
}

- pwm->base = ioremap_nocache(r->start, resource_size(r));
- if (pwm->base == NULL) {
- dev_err(&pdev->dev, "failed to remap memory resource\n");
- ret = -EADDRNOTAVAIL;
- goto err_release_mem;
- }
+ pwm->base = devm_request_and_ioremap(&pdev->dev, r);
+ if (pwm->base == NULL)
+ return -EADDRNOTAVAIL;

__add_pwm(pwm);
platform_set_drvdata(pdev, pwm);
return 0;
-
-err_release_mem:
- release_mem_region(r->start, resource_size(r));
-err_free_clk:
- clk_put(pwm->clk);
-err_free:
- kfree(pwm);
- return ret;
}

static int __devexit pwm_remove(struct platform_device *pdev)
{
struct pwm_device *pwm;
- struct resource *r;

pwm = platform_get_drvdata(pdev);
if (pwm == NULL)
@@ -230,13 +208,6 @@ static int __devexit pwm_remove(struct platform_device *pdev)
list_del(&pwm->node);
mutex_unlock(&pwm_lock);

- iounmap(pwm->base);
-
- r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(r->start, resource_size(r));
-
- clk_put(pwm->clk);
- kfree(pwm);
return 0;
}

--
1.7.12


\
 
 \ /
  Last update: 2012-09-02 13:02    [from the cache]
©2003-2011 Jasper Spaans