Re: [PATCH v1 13/16] serial: max3100: Extract to_max3100_port() helper macro

[Hugo Villeneuve]

On Tue,  2 Apr 2024 18:38:19 +0300
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:

> Instead of using container_of() explicitly, introduce a heler macro.

heler -> helper

Reviewed-by: Hugo Villeneuve <hvilleneuve@xxxxxxxxxxxx>


> This saves a lot of lines of code.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
>  drivers/tty/serial/max3100.c | 67 ++++++++++--------------------------
>  1 file changed, 19 insertions(+), 48 deletions(-)
> 
> diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
> index 585bf6c898b2..19b05992a9ac 100644
> --- a/drivers/tty/serial/max3100.c
> +++ b/drivers/tty/serial/max3100.c
> @@ -16,6 +16,7 @@
>  /* 4 MAX3100s should be enough for everyone */
>  #define MAX_MAX3100 4
>  
> +#include <linux/container_of.h>
>  #include <linux/delay.h>
>  #include <linux/slab.h>
>  #include <linux/device.h>
> @@ -110,6 +111,8 @@ struct max3100_port {
>  	struct timer_list	timer;
>  };
>  
> +#define to_max3100_port(port)	container_of(port, struct max3100_port, port)
> +
>  static struct max3100_port *max3100s[MAX_MAX3100]; /* the chips */
>  static DEFINE_MUTEX(max3100s_lock);		   /* race on probe */
>  
> @@ -322,9 +325,7 @@ static irqreturn_t max3100_irq(int irqno, void *dev_id)
>  
>  static void max3100_enable_ms(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	mod_timer(&s->timer, jiffies);
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
> @@ -332,9 +333,7 @@ static void max3100_enable_ms(struct uart_port *port)
>  
>  static void max3100_start_tx(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  
> @@ -343,9 +342,7 @@ static void max3100_start_tx(struct uart_port *port)
>  
>  static void max3100_stop_rx(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  
> @@ -359,9 +356,7 @@ static void max3100_stop_rx(struct uart_port *port)
>  
>  static unsigned int max3100_tx_empty(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  
> @@ -372,9 +367,7 @@ static unsigned int max3100_tx_empty(struct uart_port *port)
>  
>  static unsigned int max3100_get_mctrl(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  
> @@ -386,9 +379,7 @@ static unsigned int max3100_get_mctrl(struct uart_port *port)
>  
>  static void max3100_set_mctrl(struct uart_port *port, unsigned int mctrl)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  	int loopback, rts;
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
> @@ -414,9 +405,7 @@ static void
>  max3100_set_termios(struct uart_port *port, struct ktermios *termios,
>  		    const struct ktermios *old)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  	unsigned int baud = port->uartclk / 16;
>  	unsigned int baud230400 = (baud == 230400) ? 1 : 0;
>  	unsigned cflag;
> @@ -532,9 +521,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
>  
>  static void max3100_shutdown(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  	u16 rx;
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
> @@ -559,9 +546,7 @@ static void max3100_shutdown(struct uart_port *port)
>  
>  static int max3100_startup(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  	char b[12];
>  	int ret;
>  
> @@ -607,9 +592,7 @@ static int max3100_startup(struct uart_port *port)
>  
>  static const char *max3100_type(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  
> @@ -618,18 +601,14 @@ static const char *max3100_type(struct uart_port *port)
>  
>  static void max3100_release_port(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  }
>  
>  static void max3100_config_port(struct uart_port *port, int flags)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  
> @@ -640,9 +619,7 @@ static void max3100_config_port(struct uart_port *port, int flags)
>  static int max3100_verify_port(struct uart_port *port,
>  			       struct serial_struct *ser)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  	int ret = -EINVAL;
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
> @@ -654,18 +631,14 @@ static int max3100_verify_port(struct uart_port *port,
>  
>  static void max3100_stop_tx(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  }
>  
>  static int max3100_request_port(struct uart_port *port)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  	return 0;
> @@ -673,9 +646,7 @@ static int max3100_request_port(struct uart_port *port)
>  
>  static void max3100_break_ctl(struct uart_port *port, int break_state)
>  {
> -	struct max3100_port *s = container_of(port,
> -					      struct max3100_port,
> -					      port);
> +	struct max3100_port *s = to_max3100_port(port);
>  
>  	dev_dbg(&s->spi->dev, "%s\n", __func__);
>  }
> -- 
> 2.43.0.rc1.1.gbec44491f096
> 
> 


-- 
Hugo Villeneuve