openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tty: serial: omap: switch over to devm_request_gpio 

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>
This commit is contained in:
Felipe Balbi 2014-04-23 09:58:30 -05:00 committed by Greg Kroah-Hartman
parent 5b6acc7925
commit 404dc57c02
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/omap-serial.c
View File

@ -1611,7 +1611,7 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
/* check for tx enable gpio */ /* check for tx enable gpio */
up->rts_gpio = of_get_named_gpio_flags(np, "rts-gpio", 0, &flags); up->rts_gpio = of_get_named_gpio_flags(np, "rts-gpio", 0, &flags);
if (gpio_is_valid(up->rts_gpio)) { 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) if (ret < 0)
return ret; return ret;
ret = gpio_direction_output(up->rts_gpio, 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) && if (gpio_is_valid(omap_up_info->DTR_gpio) &&
omap_up_info->DTR_present) { 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) if (ret < 0)
return ret; return ret;
ret = gpio_direction_output(omap_up_info->DTR_gpio, ret = gpio_direction_output(omap_up_info->DTR_gpio,