[PATCH 2/7] gpio: 104-idi-48: Use devm_request_region

[William Breathitt Gray]

By the time request_region is called in the ACCES 104-IDI-48 GPIO
driver, a corresponding device structure has already been allocated. The
devm_request_region function should be used to help simplify the cleanup
code and reduce the possible points of failure.

Signed-off-by: William Breathitt Gray <vilhelm.g...@gmail.com>
---
 drivers/gpio/gpio-104-idi-48.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c
index 285a075..70359f7 100644
--- a/drivers/gpio/gpio-104-idi-48.c
+++ b/drivers/gpio/gpio-104-idi-48.c
@@ -227,11 +227,10 @@ static int __init idi_48_probe(struct platform_device 
*pdev)
        if (!idi48gpio)
                return -ENOMEM;
 
-       if (!request_region(base, extent, name)) {
-               dev_err(dev, "Unable to lock %s port addresses (0x%X-0x%X)\n",
-                       name, base, base + extent);
-               err = -EBUSY;
-               goto err_lock_io_port;
+       if (!devm_request_region(dev, base, extent, name)) {
+               dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                       base, base + extent);
+               return -EBUSY;
        }
 
        idi48gpio->chip.label = name;
@@ -253,7 +252,7 @@ static int __init idi_48_probe(struct platform_device *pdev)
        err = gpiochip_add_data(&idi48gpio->chip, idi48gpio);
        if (err) {
                dev_err(dev, "GPIO registering failed (%d)\n", err);
-               goto err_gpio_register;
+               return err;
        }
 
        /* Disable IRQ by default */
@@ -264,24 +263,20 @@ static int __init idi_48_probe(struct platform_device 
*pdev)
                handle_edge_irq, IRQ_TYPE_NONE);
        if (err) {
                dev_err(dev, "Could not add irqchip (%d)\n", err);
-               goto err_gpiochip_irqchip_add;
+               goto err_gpiochip_remove;
        }
 
        err = request_irq(irq, idi_48_irq_handler, IRQF_SHARED, name,
                idi48gpio);
        if (err) {
                dev_err(dev, "IRQ handler registering failed (%d)\n", err);
-               goto err_request_irq;
+               goto err_gpiochip_remove;
        }
 
        return 0;
 
-err_request_irq:
-err_gpiochip_irqchip_add:
+err_gpiochip_remove:
        gpiochip_remove(&idi48gpio->chip);
-err_gpio_register:
-       release_region(base, extent);
-err_lock_io_port:
        return err;
 }
 
@@ -291,7 +286,6 @@ static int idi_48_remove(struct platform_device *pdev)
 
        free_irq(idi48gpio->irq, idi48gpio);
        gpiochip_remove(&idi48gpio->chip);
-       release_region(idi48gpio->base, idi48gpio->extent);
 
        return 0;
 }
-- 
2.4.10