tty: serial: omap: switch over to devm_request_gpio
authorFelipe Balbi <balbi@ti.com>
Wed, 23 Apr 2014 14:58:30 +0000 (09:58 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 24 Apr 2014 23:16:33 +0000 (16:16 -0700)
this will make sure gpio gets freed automatically
when this device is destroyed.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/omap-serial.c

index f456f461dd02c892353c6f40c01eca05d34b54b6..07d4273e35a1230c11707203ffb3cfd8be71aab5 100644 (file)
@@ -1611,7 +1611,7 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
        /* check for tx enable gpio */
        up->rts_gpio = of_get_named_gpio_flags(np, "rts-gpio", 0, &flags);
        if (gpio_is_valid(up->rts_gpio)) {
-               ret = gpio_request(up->rts_gpio, "omap-serial");
+               ret = devm_gpio_request(up->dev, up->rts_gpio, "omap-serial");
                if (ret < 0)
                        return ret;
                ret = gpio_direction_output(up->rts_gpio,
@@ -1677,7 +1677,8 @@ static int serial_omap_probe(struct platform_device *pdev)
 
        if (gpio_is_valid(omap_up_info->DTR_gpio) &&
            omap_up_info->DTR_present) {
-               ret = gpio_request(omap_up_info->DTR_gpio, "omap-serial");
+               ret = devm_gpio_request(&pdev->dev, omap_up_info->DTR_gpio,
+                               "omap-serial");
                if (ret < 0)
                        return ret;
                ret = gpio_direction_output(omap_up_info->DTR_gpio,