]> git.karo-electronics.de Git - linux-beck.git/commitdiff
serial: max310x: Fix build error
authorAlexander Shiyan <shc_work@mail.ru>
Thu, 13 Feb 2014 19:12:48 +0000 (23:12 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Feb 2014 23:20:13 +0000 (15:20 -0800)
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>
drivers/tty/serial/max310x.c

index 8dec480a73dfc7e5210a6f53ebb3e2830e5ef563..5836168414e4e0999bb5d3003b010384dceb8220 100644 (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,
                         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)