linux-next: build warning after merge of the tty tree

linux-next: build warning after merge of the tty tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

Hi Greg,

After merging the tty tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

drivers/tty/serial/imx.c: In function 'imx_set_termios':
drivers/tty/serial/imx.c:1301:7: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
    if (port->rs485.flags & SER_RS485_ENABLED)
       ^

Introduced by commit 17b8f2a3fdca ("serial: imx: add support for half
duplex rs485").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build warning after merge of the tty tree

[Uwe Kleine-König]

Hello Greg,

On Tue, Mar 10, 2015 at 04:28:16PM +1100, Stephen Rothwell wrote:
> After merging the tty tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
> 
> drivers/tty/serial/imx.c: In function 'imx_set_termios':
> drivers/tty/serial/imx.c:1301:7: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
>     if (port->rs485.flags & SER_RS485_ENABLED)
>        ^
> 
> Introduced by commit 17b8f2a3fdca ("serial: imx: add support for half
> duplex rs485").
should I send a fixed commit or do you prefer an incremental change?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Re: linux-next: build warning after merge of the tty tree

[Greg KH]

On Tue, Mar 10, 2015 at 09:23:18AM +0100, Uwe Kleine-König wrote:
> Hello Greg,
> 
> On Tue, Mar 10, 2015 at 04:28:16PM +1100, Stephen Rothwell wrote:
> > After merging the tty tree, today's linux-next build (arm
> > multi_v7_defconfig) produced this warning:
> > 
> > drivers/tty/serial/imx.c: In function 'imx_set_termios':
> > drivers/tty/serial/imx.c:1301:7: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
> >     if (port->rs485.flags & SER_RS485_ENABLED)
> >        ^
> > 
> > Introduced by commit 17b8f2a3fdca ("serial: imx: add support for half
> > duplex rs485").
> should I send a fixed commit or do you prefer an incremental change?

It's already in my tree, so I need an add-on patch.

thanks,

greg k-h

[PATCH] fixup! serial: imx: add support for half duplex rs485

[Uwe Kleine-König]

---
 drivers/tty/serial/imx.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index ddfb672d0152..e9102eba49c4 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1298,7 +1298,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
 		if (sport->have_rtscts) {
 			ucr2 &= ~UCR2_IRTS;
 
-			if (port->rs485.flags & SER_RS485_ENABLED)
+			if (port->rs485.flags & SER_RS485_ENABLED) {
 				/*
 				 * RTS is mandatory for rs485 operation, so keep
 				 * it under manual control and keep transmitter
@@ -1307,8 +1307,9 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
 				if (!(port->rs485.flags &
 				      SER_RS485_RTS_AFTER_SEND))
 					ucr2 |= UCR2_CTS;
-			else
+			} else {
 				ucr2 |= UCR2_CTSC;
+			}
 
 		} else {
 			termios->c_cflag &= ~CRTSCTS;
-- 
2.1.4

Re: [PATCH] fixup! serial: imx: add support for half duplex rs485

[Greg KH]

On Tue, Mar 10, 2015 at 09:31:09AM +0100, Uwe Kleine-König wrote:
> ---
>  drivers/tty/serial/imx.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Same errors as your other patch :(