serial: max310x: Fix build error
PATCH v2 1/1 serial: max310x: Fix build error
This is a temporary solution to fix following issue:
config: make ARCH=alpha allyesconfig
All error/warnings:
drivers/tty/serial/max310x.c: In function 'max310x_ioctl':
Quoted 1 line
Quoted 1 line
drivers/tty/serial/max310x.c:905:7: error: 'TIOCSRS485' undeclared (first use in this function)
drivers/tty/serial/max310x.c:905:7: note: each undeclared identifier is reported only once for each function it appears in
Quoted 3 lines
Quoted 3 lines
drivers/tty/serial/max310x.c:906:3: error: implicit declaration of function 'copy_from_user' [-Werror=implicit-function-declaration]drivers/tty/serial/max310x.c:929:7: error: 'TIOCGRS485' undeclared (first use in this function)drivers/tty/serial/max310x.c:938:3: error: implicit declaration of function 'copy_to_user' [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
---
Greg, this is a v2, so please revert previous fix first. Sorry for noise. Thanks.
--- drivers/tty/serial/max310x.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/tty/serial/max310x.c +6 -4
@@ -876,6 +876,7 @@ static void max310x_set_termios(struct uart_port *port,static int max310x_ioctl (struct uart_port *port,unsigned int cmd,unsigned long arg) { +#if defined(TIOCSRS485 ) && defined(TIOCGRS485 )struct serial_rs485 rs485;unsigned int val;
@@ -903,7 +904,7 @@ static int max310x_ioctl(struct uart_port *port, unsigned int cmd,max310x_port_update (port,MAX310X_MODE2_REG ,MAX310X_MODE2_ECHOSUPR_BIT ,0 ); } -break ; +return 0 ;case TIOCGRS485 :memset (&rs485,0 ,sizeof (rs485)); val =max310x_port_read (port,MAX310X_MODE1_REG );
@@ -916,12 +917,13 @@ static int max310x_ioctl(struct uart_port *port, unsigned int cmd,if (copy_to_user ((struct serial_rs485 *)arg, &rs485,sizeof (rs485)))return -EFAULT ; -break ; +return 0 ;default : -return -ENOIOCTLCMD ; + break; } +#endif -return 0 ; +return -ENOIOCTLCMD ; }static int max310x_startup (struct uart_port *port)
Signature · 1 line
1.8.3.2