Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
MIME-Version: 1.0
References: <20231006214433.339688-1-robh@kernel.org> <ZSQREEr0WBk15fFJ@x1-carbon>
In-Reply-To: <ZSQREEr0WBk15fFJ@x1-carbon>
From:   Rob Herring <robh@kernel.org>
Date:   Mon, 9 Oct 2023 10:19:54 -0500
Message-ID: <CAL_Jsq+Q0iR19OfyUhCvA24w+PzVNzG2qMhcH56qkADBa83Omg@mail.gmail.com>
Subject: Re: [PATCH] ata: xgene: Use of_device_get_match_data()
To:     Niklas Cassel <Niklas.Cassel@wdc.com>
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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Oct 9, 2023 at 9:41=E2=80=AFAM Niklas Cassel <Niklas.Cassel@wdc.com=
> wrote:
>
> 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() t=
o
> > 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 =3D XGENE_AHCI_V1;
> >       const struct ata_port_info *ppi[] =3D { &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 =3D csr;
> >       }
> >
> > -     of_devid =3D of_match_device(xgene_ahci_of_match, dev);
> > -     if (of_devid) {
> > -             if (of_devid->data)
> > -                     version =3D (unsigned long) of_devid->data;
> > +     if (dev->of_node) {
> > +             version =3D (enum xgene_ahci_version)of_device_get_match_=
data(dev);
> >       }
>
> Nit: braces can be removed.
>
> >  #ifdef CONFIG_ACPI
> >       else {

Coding style says otherwise when the 'else' has braces.

Rob