Re: [PATCH v2] tty: serial: cpm_uart: Fix behaviour for non existing GPIOs

2020-06-20 Thread Linus Walleij
On Fri, Jun 12, 2020 at 8:26 PM Christophe Leroy
 wrote:

> devm_gpiod_get_index() doesn't return NULL but -ENOENT when the
> requested GPIO doesn't exist,  leading to the following messages:
>
> [2.742468] gpiod_direction_input: invalid GPIO (errorpointer)
> [2.748147] can't set direction for gpio #2: -2
> [2.753081] gpiod_direction_input: invalid GPIO (errorpointer)
> [2.758724] can't set direction for gpio #3: -2
> [2.763666] gpiod_direction_output: invalid GPIO (errorpointer)
> [2.769394] can't set direction for gpio #4: -2
> [2.774341] gpiod_direction_input: invalid GPIO (errorpointer)
> [2.779981] can't set direction for gpio #5: -2
> [2.784545] ff000a20.serial: ttyCPM1 at MMIO 0xfff00a20 (irq = 39, 
> base_baud = 825) is a CPM UART
>
> Use devm_gpiod_get_index_optional() instead.
>
> At the same time, handle the error case and properly exit
> with an error.
>
> Fixes: 97cbaf2c829b ("tty: serial: cpm_uart: Convert to use GPIO descriptors")
> Cc: sta...@vger.kernel.org
> Cc: Linus Walleij 
> Signed-off-by: Christophe Leroy 
> ---
> v2: Using devm_gpiod_get_index_optional() and exiting if error

Excellent!
Reviewed-by: Linus Walleij 

Yours,
Linus Walleij


[PATCH v2] tty: serial: cpm_uart: Fix behaviour for non existing GPIOs

2020-06-12 Thread Christophe Leroy
devm_gpiod_get_index() doesn't return NULL but -ENOENT when the
requested GPIO doesn't exist,  leading to the following messages:

[2.742468] gpiod_direction_input: invalid GPIO (errorpointer)
[2.748147] can't set direction for gpio #2: -2
[2.753081] gpiod_direction_input: invalid GPIO (errorpointer)
[2.758724] can't set direction for gpio #3: -2
[2.763666] gpiod_direction_output: invalid GPIO (errorpointer)
[2.769394] can't set direction for gpio #4: -2
[2.774341] gpiod_direction_input: invalid GPIO (errorpointer)
[2.779981] can't set direction for gpio #5: -2
[2.784545] ff000a20.serial: ttyCPM1 at MMIO 0xfff00a20 (irq = 39, base_baud 
= 825) is a CPM UART

Use devm_gpiod_get_index_optional() instead.

At the same time, handle the error case and properly exit
with an error.

Fixes: 97cbaf2c829b ("tty: serial: cpm_uart: Convert to use GPIO descriptors")
Cc: sta...@vger.kernel.org
Cc: Linus Walleij 
Signed-off-by: Christophe Leroy 
---
v2: Using devm_gpiod_get_index_optional() and exiting if error
---
 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c 
b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index a04f74d2e854..4df47d02b34b 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -1215,7 +1215,12 @@ static int cpm_uart_init_port(struct device_node *np,
 
pinfo->gpios[i] = NULL;
 
-   gpiod = devm_gpiod_get_index(dev, NULL, i, GPIOD_ASIS);
+   gpiod = devm_gpiod_get_index_optional(dev, NULL, i, GPIOD_ASIS);
+
+   if (IS_ERR(gpiod)) {
+   ret = PTR_ERR(gpiod);
+   goto out_irq;
+   }
 
if (gpiod) {
if (i == GPIO_RTS || i == GPIO_DTR)
@@ -1237,6 +1242,8 @@ static int cpm_uart_init_port(struct device_node *np,
 
return cpm_uart_request_port(>port);
 
+out_irq:
+   irq_dispose_mapping(pinfo->port.irq);
 out_pram:
cpm_uart_unmap_pram(pinfo, pram);
 out_mem:
-- 
2.25.0