From e5cb8db5914ced90f4bfa810062c77f4352aceb8 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Thu, 30 Aug 2012 15:52:28 +0200 Subject: [PATCH] --- yaml --- r: 333104 b: refs/heads/master c: 5384e27317016bd30aa7a7a7513f76ce7caa3b09 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/unicore32/kernel/pwm.c | 47 ++++++------------------------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/[refs] b/[refs] index b05972256777..5f3a35631e3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e551fadef3650c34137e90f17963ca613b8f8610 +refs/heads/master: 5384e27317016bd30aa7a7a7513f76ce7caa3b09 diff --git a/trunk/arch/unicore32/kernel/pwm.c b/trunk/arch/unicore32/kernel/pwm.c index 7e234700d80f..724e8603120b 100644 --- a/trunk/arch/unicore32/kernel/pwm.c +++ b/trunk/arch/unicore32/kernel/pwm.c @@ -160,19 +160,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; @@ -182,41 +180,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) @@ -226,13 +204,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; }