Re: [PATCH 1/4] pwm: Convert pwm-imx to use devm_* APIs

Thierry Reding
2012-06-30T18:44:08Z

[-- Attachment #1: Type: text/plain, Size: 1790 bytes --]

On Fri, Jun 29, 2012 at 09:30:28PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/pwm/pwm-imx.c | 55 +++++++++----------------------------------------
> 1 file changed, 10 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
[...]
> @@ -182,46 +180,24 @@ static int __devinit imx_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;
> }
>
> - imx->mmio_base = ioremap(r->start, resource_size(r));
> - if (imx->mmio_base == NULL) {
> - dev_err(&pdev->dev, "failed to ioremap() registers\n");
> - ret = -ENODEV;
> - goto err_free_mem;
> - }
> + imx->mmio_base = devm_request_and_ioremap(&pdev->dev, r);
> + if (imx->mmio_base == NULL)
> + return -ENODEV;

The documentation says that the standard error code for failure here is
EADDRNOTAVAIL.

> @@ -229,18 +205,7 @@ static int __devexit imx_pwm_remove(struct platform_device *pdev)
> return -ENODEV;
>
> ret = pwmchip_remove(&imx->chip);
> - if (ret)
> - return ret;
> -
> - iounmap(imx->mmio_base);
> -
> - r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(r->start, resource_size(r));
> -
> - clk_put(imx->clk);
> -
> - kfree(imx);
> - return 0;
> + return ret;

I think you can just "return pwmchip_remove(...);", no need to store the
result in ret.