renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

serial: max310x: Fix build error

Browse Source 
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':
>> 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
>> 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

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Shiyan 2014-02-13 23:12:48 +04:00 committed by Greg Kroah-Hartman
parent 1456dad9bc
commit 86a41c46c7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/serial/max310x.c
View File

@ -876,6 +876,7 @@ static void max310x_set_termios(struct uart_port *port,
static int max310x_ioctl(struct uart_port *port, unsigned int cmd, static int max310x_ioctl(struct uart_port *port, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
#if defined(TIOCSRS485) && defined(TIOCGRS485)
struct serial_rs485 rs485; struct serial_rs485 rs485;
unsigned int val; 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_port_update(port, MAX310X_MODE2_REG,
MAX310X_MODE2_ECHOSUPR_BIT, 0); MAX310X_MODE2_ECHOSUPR_BIT, 0);
} }
break; return 0;
case TIOCGRS485: case TIOCGRS485:
memset(&rs485, 0, sizeof(rs485)); memset(&rs485, 0, sizeof(rs485));
val = max310x_port_read(port, MAX310X_MODE1_REG); 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, if (copy_to_user((struct serial_rs485 *)arg, &rs485,
sizeof(rs485))) sizeof(rs485)))
return -EFAULT; return -EFAULT;
break; return 0;
default: default:
return -ENOIOCTLCMD; break;
} }
#endif
return 0; return -ENOIOCTLCMD;
} }
static int max310x_startup(struct uart_port *port) static int max310x_startup(struct uart_port *port)