[PATCH 1/3] serial: Rename vars in uart_get_rs485_config()

Ilpo Järvinen posted 3 patches 3 years, 7 months ago
There is a newer version of this series
[PATCH 1/3] serial: Rename vars in uart_get_rs485_config()
Posted by Ilpo Järvinen 3 years, 7 months ago
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(-)

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 12c87cd201a7..9c1bf36b7a93 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -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;
-- 
2.30.2

Re: [PATCH 1/3] serial: Rename vars in uart_get_rs485_config()
Posted by Andy Shevchenko 3 years, 7 months ago
On Fri, Aug 26, 2022 at 5:50 PM Ilpo Järvinen
<ilpo.jarvinen@linux.intel.com> wrote:
>
> Make variable names to match uart_set_rs485_config() ones:
>         - rs485 -> rs485_user
>         - aux -> rs485

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
(see below)

> 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(-)
>
> diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
> index 12c87cd201a7..9c1bf36b7a93 100644
> --- a/drivers/tty/serial/serial_core.c
> +++ b/drivers/tty/serial/serial_core.c
> @@ -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;

At the same time you may order it by "the longest line first".

>         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;

-- 
With Best Regards,
Andy Shevchenko