@@ -1408,16 +1408,16 @@ int uart_rs485_config(struct uart_port *port)
EXPORT_SYMBOL_GPL(uart_rs485_config);
static int uart_get_rs485_config(struct uart_port *port,
- struct serial_rs485 __user *rs485)
+ struct serial_rs485 __user *rs485_user)
{
unsigned long flags;
- struct serial_rs485 aux;
+ struct serial_rs485 rs485;
spin_lock_irqsave(&port->lock, flags);
- aux = port->rs485;
+ rs485 = port->rs485;
spin_unlock_irqrestore(&port->lock, flags);
- if (copy_to_user(rs485, &aux, sizeof(aux)))
+ if (copy_to_user(rs485_user, &rs485, sizeof(rs485)))
return -EFAULT;
return 0;
Make variable names to match uart_set_rs485_config() ones: - rs485 -> rs485_user - aux -> rs485 Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- drivers/tty/serial/serial_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)