Re: [PATCH v3 3/3] ata: ahci_platform: Make code agnostic to OF/ACPI

From: Serge Semin
Date: Tue Jun 13 2023 - 15:11:46 EST


On Mon, Jun 12, 2023 at 07:10:11PM +0300, Andy Shevchenko wrote:
> With the help of a new device_is_compatible() make the driver code
> agnostic to the OF/ACPI. This makes it neater. As a side effect
> the header inclusions is corrected (seems mod_devicetable.h was
> implicitly included).
>
> Reviewed-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>

C/P v2:
I don't think the driver will get to be fully agnostic after this
patch because for instance the ahci_platform_get_resources() method
directly uses the OF-available functions, walks over the OF subnodes,
touches the OF-properties, etc. So AFAICS in order to be fully OF/ACPI
agnostic the entire libahci_platform.o driver needs to be converted
too, but it's not trivial at all.

Anyway as a start this patch looks good.
Reviewed-by: Serge Semin <fancer.lancer@xxxxxxxxx>

-Serge(y)

> ---
> drivers/ata/ahci_platform.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index ab30c7138d73..81fc63f6b008 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -9,14 +9,14 @@
> */
>
> #include <linux/kernel.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/module.h>
> #include <linux/pm.h>
> #include <linux/device.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> +#include <linux/property.h>
> #include <linux/libata.h>
> #include <linux/ahci_platform.h>
> -#include <linux/acpi.h>
> #include <linux/pci_ids.h>
> #include "ahci.h"
>
> @@ -56,10 +56,10 @@ static int ahci_probe(struct platform_device *pdev)
> if (rc)
> return rc;
>
> - if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
> + if (device_is_compatible(dev, "hisilicon,hisi-ahci"))
> hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
>
> - port = acpi_device_get_match_data(dev);
> + port = device_get_match_data(dev);
> if (!port)
> port = &ahci_port_info;
>
> --
> 2.40.0.1.gaa8946217a0b
>
>