| Message ID | 20190814092924.13857-3-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] serial: atmel: Don't check for mctrl_gpio_to_gpiod() returning error | expand |
On Wed, Aug 14, 2019 at 11:29:23AM +0200, Geert Uytterhoeven wrote: > Since commit 1d267ea6539f2663 ("serial: mctrl-gpio: simplify init > routine"), mctrl_gpio_init() returns failure if the assignment to any > member of the gpio array results in an error pointer. > Since commit c359522194593815 ("serial: mctrl_gpio: Avoid probe failures > in case of missing gpiolib"), mctrl_gpio_to_gpiod() returns NULL in the > !CONFIG_GPIOLIB case. > Hence there is no longer a need to check for mctrl_gpio_to_gpiod() > returning an error value. A simple NULL check is sufficient. > > This follows the spirit of commit 445df7ff3fd1a0a9 ("serial: mctrl-gpio: > drop usages of IS_ERR_OR_NULL") in the mctrl-gpio core. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/tty/serial/mxs-auart.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c > index 4c188f4079b3ea68..e3452597068292f9 100644 > --- a/drivers/tty/serial/mxs-auart.c > +++ b/drivers/tty/serial/mxs-auart.c > @@ -969,10 +969,8 @@ static int mxs_auart_dma_init(struct mxs_auart_port *s) > > } > > -#define RTS_AT_AUART() IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(s->gpios, \ > - UART_GPIO_RTS)) > -#define CTS_AT_AUART() IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(s->gpios, \ > - UART_GPIO_CTS)) > +#define RTS_AT_AUART() !mctrl_gpio_to_gpiod(s->gpios, UART_GPIO_RTS) > +#define CTS_AT_AUART() !mctrl_gpio_to_gpiod(s->gpios, UART_GPIO_CTS) > static void mxs_auart_settermios(struct uart_port *u, > struct ktermios *termios, > struct ktermios *old) > -- > 2.17.1 >
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 4c188f4079b3ea68..e3452597068292f9 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -969,10 +969,8 @@ static int mxs_auart_dma_init(struct mxs_auart_port *s) } -#define RTS_AT_AUART() IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(s->gpios, \ - UART_GPIO_RTS)) -#define CTS_AT_AUART() IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(s->gpios, \ - UART_GPIO_CTS)) +#define RTS_AT_AUART() !mctrl_gpio_to_gpiod(s->gpios, UART_GPIO_RTS) +#define CTS_AT_AUART() !mctrl_gpio_to_gpiod(s->gpios, UART_GPIO_CTS) static void mxs_auart_settermios(struct uart_port *u, struct ktermios *termios, struct ktermios *old)
Since commit 1d267ea6539f2663 ("serial: mctrl-gpio: simplify init routine"), mctrl_gpio_init() returns failure if the assignment to any member of the gpio array results in an error pointer. Since commit c359522194593815 ("serial: mctrl_gpio: Avoid probe failures in case of missing gpiolib"), mctrl_gpio_to_gpiod() returns NULL in the !CONFIG_GPIOLIB case. Hence there is no longer a need to check for mctrl_gpio_to_gpiod() returning an error value. A simple NULL check is sufficient. This follows the spirit of commit 445df7ff3fd1a0a9 ("serial: mctrl-gpio: drop usages of IS_ERR_OR_NULL") in the mctrl-gpio core. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/tty/serial/mxs-auart.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)