public inbox for linux-ide@vger.kernel.org
 help / color / mirror / Atom feed
From: Niklas Cassel <Niklas.Cassel@wdc.com>
To: Rob Herring <robh@kernel.org>
Cc: Damien Le Moal <dlemoal@kernel.org>,
	"linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ata: xgene: Use of_device_get_match_data()
Date: Mon, 9 Oct 2023 14:41:25 +0000	[thread overview]
Message-ID: <ZSQREEr0WBk15fFJ@x1-carbon> (raw)
In-Reply-To: <20231006214433.339688-1-robh@kernel.org>

On Fri, Oct 06, 2023 at 04:44:33PM -0500, Rob Herring wrote:
> Use preferred of_device_get_match_data() instead of of_match_device() to
> get the driver match data. With this, adjust the includes to explicitly
> include the correct headers.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> Perhaps device_get_match_data() could be used here and all the ACPI
> specific code dropped, but not sure if all the ACPI code is really
> necessary.
> ---
>  drivers/ata/ahci_xgene.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
> index ccef5e63bdf9..81a1d838c0fc 100644
> --- a/drivers/ata/ahci_xgene.c
> +++ b/drivers/ata/ahci_xgene.c
> @@ -13,9 +13,7 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/ahci_platform.h>
> -#include <linux/of_address.h>
> -#include <linux/of_device.h>
> -#include <linux/of_irq.h>
> +#include <linux/of.h>
>  #include <linux/phy/phy.h>
>  #include "ahci.h"
>  
> @@ -735,7 +733,6 @@ static int xgene_ahci_probe(struct platform_device *pdev)
>  	struct ahci_host_priv *hpriv;
>  	struct xgene_ahci_context *ctx;
>  	struct resource *res;
> -	const struct of_device_id *of_devid;
>  	enum xgene_ahci_version version = XGENE_AHCI_V1;
>  	const struct ata_port_info *ppi[] = { &xgene_ahci_v1_port_info,
>  					      &xgene_ahci_v2_port_info };
> @@ -778,10 +775,8 @@ static int xgene_ahci_probe(struct platform_device *pdev)
>  		ctx->csr_mux = csr;
>  	}
>  
> -	of_devid = of_match_device(xgene_ahci_of_match, dev);
> -	if (of_devid) {
> -		if (of_devid->data)
> -			version = (unsigned long) of_devid->data;
> +	if (dev->of_node) {
> +		version = (enum xgene_ahci_version)of_device_get_match_data(dev);
>  	}

Nit: braces can be removed.

>  #ifdef CONFIG_ACPI
>  	else {
> -- 
> 2.40.1
> 

With or without nit fixed:
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>

  reply	other threads:[~2023-10-09 14:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-06 21:44 [PATCH] ata: xgene: Use of_device_get_match_data() Rob Herring
2023-10-09 14:41 ` Niklas Cassel [this message]
2023-10-09 15:19   ` Rob Herring
2023-10-09 15:49     ` Niklas Cassel
2023-10-11 11:11 ` Damien Le Moal

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=ZSQREEr0WBk15fFJ@x1-carbon \
    --to=niklas.cassel@wdc.com \
    --cc=dlemoal@kernel.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh@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