[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120630194528.GA24411@avionic-0098.mockup.avionic-design.de>
Date: Sat, 30 Jun 2012 21:45:28 +0200
From: Thierry Reding <thierry.reding@...onic-design.de>
To: Axel Lin <axel.lin@...il.com>
Cc: linux-kernel@...r.kernel.org, Alexey Charkov <alchark@...il.com>
Subject: Re: [PATCH 4/4] pwm: Convert pwm-vt8500 to use devm_* APIs
On Fri, Jun 29, 2012 at 09:33:05PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@...il.com>
> ---
> drivers/pwm/pwm-vt8500.c | 45 ++++++++-------------------------------------
> 1 file changed, 8 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/pwm/pwm-vt8500.c b/drivers/pwm/pwm-vt8500.c
[...]
> @@ -127,44 +127,24 @@ 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;
> - }
> -
> - 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;
> + return -ENODEV;
> }
>
> - chip->base = ioremap(r->start, resource_size(r));
> - if (chip->base == NULL) {
> - dev_err(&pdev->dev, "failed to ioremap() registers\n");
> - ret = -ENODEV;
> - goto err_free_mem;
> - }
> + chip->base = devm_request_and_ioremap(&pdev->dev, r);
> + if (chip->base == NULL)
> + return -ENODEV;
EADDRNOTAVAIL as well.
> @@ -172,16 +152,7 @@ static int __devexit pwm_remove(struct platform_device *pdev)
> return -ENODEV;
>
> err = pwmchip_remove(&chip->chip);
> - if (err < 0)
> - return err;
> -
> - iounmap(chip->base);
> -
> - r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(r->start, resource_size(r));
> -
> - kfree(chip);
> - return 0;
> + return err;
And merge these two remaining lines.
Thierry
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists