From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Damien Le Moal <dlemoal@kernel.org>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org
Cc: Hans de Goede <hdegoede@redhat.com>, Jens Axboe <axboe@kernel.dk>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>, Daniel Scally <djrscally@gmail.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH v2 3/3] ata: ahci_platform: Make code agnostic to OF/ACPI
Date: Fri, 9 Jun 2023 18:49:00 +0300 [thread overview]
Message-ID: <20230609154900.43024-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20230609154900.43024-1-andriy.shevchenko@linux.intel.com>
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).
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
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
next prev parent reply other threads:[~2023-06-09 15:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 15:48 [PATCH v2 0/3] device property: Introduce device_is_compatible() Andy Shevchenko
2023-06-09 15:48 ` [PATCH v2 1/3] ACPI: Move ACPI_DEVICE_CLASS() to mod_devicetable.h Andy Shevchenko
2023-06-09 17:32 ` Rafael J. Wysocki
2023-06-12 15:21 ` Andy Shevchenko
2023-06-12 22:07 ` Damien Le Moal
2023-06-09 15:48 ` [PATCH v2 2/3] device property: Implement device_is_compatible() Andy Shevchenko
2023-06-12 7:57 ` Sakari Ailus
2023-06-13 9:45 ` Serge Semin
2023-06-13 15:14 ` Andy Shevchenko
2023-06-13 15:14 ` Andy Shevchenko
2023-06-13 19:23 ` Serge Semin
2023-06-09 15:49 ` Andy Shevchenko [this message]
2023-06-12 8:02 ` [PATCH v2 3/3] ata: ahci_platform: Make code agnostic to OF/ACPI Sakari Ailus
2023-06-12 15:20 ` Andy Shevchenko
2023-06-13 9:26 ` Sakari Ailus
2023-06-12 9:06 ` Sakari Ailus
2023-06-12 15:19 ` Andy Shevchenko
2023-06-13 9:27 ` Sakari Ailus
2023-06-13 9:52 ` Serge Semin
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=20230609154900.43024-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=axboe@kernel.dk \
--cc=djrscally@gmail.com \
--cc=dlemoal@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).