linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Slaby <jirislaby@kernel.org>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>
Subject: Re: [PATCH v1 2/3] serial: 8250_exar: Extract exar_get_platform() helper
Date: Wed, 9 Jun 2021 14:41:38 +0200	[thread overview]
Message-ID: <YMC3AhYbxA0Nbp8q@kroah.com> (raw)
In-Reply-To: <20210608144239.12697-2-andriy.shevchenko@linux.intel.com>

On Tue, Jun 08, 2021 at 05:42:38PM +0300, Andy Shevchenko wrote:
> We would like to use DMI matching in other functions as well.
> Hence, extract it as exar_get_platform() helper function.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/tty/serial/8250/8250_exar.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
> index bd4e9f6ac29c..3ffeedc29c83 100644
> --- a/drivers/tty/serial/8250/8250_exar.c
> +++ b/drivers/tty/serial/8250/8250_exar.c
> @@ -501,23 +501,27 @@ static const struct dmi_system_id exar_platforms[] = {
>  	{}
>  };
>  
> +static const struct exar8250_platform *exar_get_platform(void)
> +{
> +	const struct dmi_system_id *dmi_match;
> +
> +	dmi_match = dmi_first_match(exar_platforms);
> +	if (dmi_match)
> +		return dmi_match->driver_data;
> +
> +	return &exar8250_default_platform;
> +}
> +
>  static int
>  pci_xr17v35x_setup(struct exar8250 *priv, struct pci_dev *pcidev,
>  		   struct uart_8250_port *port, int idx)
>  {
> -	const struct exar8250_platform *platform;
> -	const struct dmi_system_id *dmi_match;
> +	const struct exar8250_platform *platform = exar_get_platform();
>  	unsigned int offset = idx * 0x400;
>  	unsigned int baud = 7812500;
>  	u8 __iomem *p;
>  	int ret;
>  
> -	dmi_match = dmi_first_match(exar_platforms);
> -	if (dmi_match)
> -		platform = dmi_match->driver_data;
> -	else
> -		platform = &exar8250_default_platform;
> -
>  	port->port.uartclk = baud * 16;
>  	port->port.rs485_config = platform->rs485_config;
>  
> -- 
> 2.30.2
> 

Do not mix "fixes with features" in a single series, as I now have to
pick it apart and apply it to different branches by hand :(

Please do different series for the two different things if at all
possible.

thanks,

greg k-h

  reply	other threads:[~2021-06-09 12:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-08 14:42 [PATCH v1 1/3] serial: 8250_exar: Avoid NULL pointer dereference at ->exit() Andy Shevchenko
2021-06-08 14:42 ` [PATCH v1 2/3] serial: 8250_exar: Extract exar_get_platform() helper Andy Shevchenko
2021-06-09 12:41   ` Greg Kroah-Hartman [this message]
2021-06-09 17:02     ` Andy Shevchenko
2021-06-08 14:42 ` [PATCH v1 3/3] serial: 8250_exar: Add ->unregister_gpio() callback Andy Shevchenko
2021-06-09 12:42   ` Greg Kroah-Hartman
2021-06-08 15:09 ` [PATCH v1 1/3] serial: 8250_exar: Avoid NULL pointer dereference at ->exit() Maxim Levitsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YMC3AhYbxA0Nbp8q@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=jirislaby@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).