gpio: 104-dio-48e: Utilize devm_ functions in driver probe callback

The devm_ resource manager functions allow memory to be automatically
released when a device is unbound. This patch takes advantage of the
resource manager functions and replaces the gpiochip_add_data call and
request_irq call with the devm_gpiochip_add_data call and
devm_request_irq call respectively. In addition, the dio48e_remove
function has been removed as no longer necessary due to the use of the
relevant devm_ resource manager functions.

Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index 7bc891f1d11a4e9494974cde62cf02f66df9baf0..221243f17d4e4eba768cf071a5a10b096711f214 100644 (file)
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -48,7 +48,6 @@ MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers");
  * @control:   Control registers state
  * @lock:      synchronization lock to prevent I/O race conditions
  * @base:      base port address of the GPIO device
- * @irq:       Interrupt line number
  * @irq_mask:  I/O bits affected by interrupts
  */
 struct dio48e_gpio {
@@ -58,7 +57,6 @@ struct dio48e_gpio {
        unsigned char control[2];
        spinlock_t lock;
        unsigned base;
-       unsigned irq;
        unsigned char irq_mask;
 };
 
@@ -368,13 +366,12 @@ static int dio48e_probe(struct device *dev, unsigned int id)
        dio48egpio->chip.set = dio48e_gpio_set;
        dio48egpio->chip.set_multiple = dio48e_gpio_set_multiple;
        dio48egpio->base = base[id];
-       dio48egpio->irq = irq[id];
 
        spin_lock_init(&dio48egpio->lock);
 
        dev_set_drvdata(dev, dio48egpio);
 
-       err = gpiochip_add_data(&dio48egpio->chip, dio48egpio);
+       err = devm_gpiochip_add_data(dev, &dio48egpio->chip, dio48egpio);
        if (err) {
                dev_err(dev, "GPIO registering failed (%d)\n", err);
                return err;
@@ -399,29 +396,16 @@ static int dio48e_probe(struct device *dev, unsigned int id)
                handle_edge_irq, IRQ_TYPE_NONE);
        if (err) {
                dev_err(dev, "Could not add irqchip (%d)\n", err);
-               goto err_gpiochip_remove;
+               return err;
        }
 
-       err = request_irq(irq[id], dio48e_irq_handler, 0, name, dio48egpio);
+       err = devm_request_irq(dev, irq[id], dio48e_irq_handler, 0, name,
+               dio48egpio);
        if (err) {
                dev_err(dev, "IRQ handler registering failed (%d)\n", err);
-               goto err_gpiochip_remove;
+               return err;
        }
 
-       return 0;
-
-err_gpiochip_remove:
-       gpiochip_remove(&dio48egpio->chip);
-       return err;
-}
-
-static int dio48e_remove(struct device *dev, unsigned int id)
-{
-       struct dio48e_gpio *const dio48egpio = dev_get_drvdata(dev);
-
-       free_irq(dio48egpio->irq, dio48egpio);
-       gpiochip_remove(&dio48egpio->chip);
-
        return 0;
 }
 
@@ -430,7 +414,6 @@ static struct isa_driver dio48e_driver = {
        .driver = {
                .name = "104-dio-48e"
        },
-       .remove = dio48e_remove
 };
 module_isa_driver(dio48e_driver, num_dio48e);