[PATCH 03/03] gpio: rcar: Make use of devm functions

[Magnus Damm]

From: Magnus Damm <d...@opensource.se>

Update the gpio-rcar.c driver to make use of devm
functions. This simplifies the error handling and
makes the code more compact.

Signed-off-by: Magnus Damm <d...@opensource.se>
---

 drivers/gpio/gpio-rcar.c |   32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

--- 0005/drivers/gpio/gpio-rcar.c
+++ work/drivers/gpio/gpio-rcar.c       2013-03-13 19:47:17.000000000 +0900
@@ -252,7 +252,7 @@ static int gpio_rcar_probe(struct platfo
        const char *name = dev_name(&pdev->dev);
        int ret;
 
-       p = kzalloc(sizeof(*p), GFP_KERNEL);
+       p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
        if (!p) {
                dev_err(&pdev->dev, "failed to allocate driver data\n");
                ret = -ENOMEM;
@@ -273,14 +273,15 @@ static int gpio_rcar_probe(struct platfo
        if (!io || !irq) {
                dev_err(&pdev->dev, "missing IRQ or IOMEM\n");
                ret = -EINVAL;
-               goto err1;
+               goto err0;
        }
 
-       p->base = ioremap_nocache(io->start, resource_size(io));
+       p->base = devm_ioremap_nocache(&pdev->dev, io->start,
+                                      resource_size(io));
        if (!p->base) {
                dev_err(&pdev->dev, "failed to remap I/O memory\n");
                ret = -ENXIO;
-               goto err1;
+               goto err0;
        }
 
        gpio_chip = &p->gpio_chip;
@@ -310,19 +311,20 @@ static int gpio_rcar_probe(struct platfo
        if (!p->irq_domain) {
                ret = -ENXIO;
                dev_err(&pdev->dev, "cannot initialize irq domain\n");
-               goto err2;
+               goto err1;
        }
 
-       if (request_irq(irq->start, gpio_rcar_irq_handler, 0, name, p)) {
+       if (devm_request_irq(&pdev->dev, irq->start,
+                            gpio_rcar_irq_handler, 0, name, p)) {
                dev_err(&pdev->dev, "failed to request IRQ\n");
                ret = -ENOENT;
-               goto err3;
+               goto err1;
        }
 
        ret = gpiochip_add(gpio_chip);
        if (ret) {
                dev_err(&pdev->dev, "failed to add GPIO controller\n");
-               goto err4;
+               goto err1;
        }
 
        dev_info(&pdev->dev, "driving %d GPIOs\n", p->config.number_of_pins);
@@ -337,14 +339,8 @@ static int gpio_rcar_probe(struct platfo
 
        return 0;
 
-err4:
-       free_irq(irq->start, p);
-err3:
-       irq_domain_remove(p->irq_domain);
-err2:
-       iounmap(p->base);
 err1:
-       kfree(p);
+       irq_domain_remove(p->irq_domain);
 err0:
        return ret;
 }
@@ -352,19 +348,13 @@ err0:
 static int gpio_rcar_remove(struct platform_device *pdev)
 {
        struct gpio_rcar_priv *p = platform_get_drvdata(pdev);
-       struct resource *irq;
        int ret;
 
        ret = gpiochip_remove(&p->gpio_chip);
        if (ret)
                return ret;
 
-       irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-
-       free_irq(irq->start, p);
        irq_domain_remove(p->irq_domain);
-       iounmap(p->base);
-       kfree(p);
        return 0;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/