Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     "Rafael J. Wysocki" <rafael@kernel.org>,
        Len Brown <lenb@kernel.org>
Subject: [PATCH v1 5/5] ACPI: bus: Use the matching table, if ACPI driver has it
Date:   Thu, 25 Aug 2022 19:41:03 +0300
Message-Id: <20220825164103.27694-5-andriy.shevchenko@linux.intel.com>
In-Reply-To: <20220825164103.27694-1-andriy.shevchenko@linux.intel.com>
References: <20220825164103.27694-1-andriy.shevchenko@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

In case we have an ACPI driver, check its ID table for matching,
This allows to use some generic device property APIs in such
drivers.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/acpi/bus.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 3c0f2d050d47..17c98e826bde 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1049,14 +1049,30 @@ static const void *acpi_of_device_get_match_data(const struct device *dev)
 	return match->data;
 }
 
+static const struct acpi_device_id *acpi_device_get_ids(const struct device *dev)
+{
+	if (dev->driver->acpi_match_table)
+		return dev->driver->acpi_match_table;
+
+	if (dev_is_acpi(dev)) {
+		struct acpi_driver *drv = to_acpi_driver(dev->driver);
+
+		if (drv->ids)
+			return drv->ids;
+	}
+
+	return NULL;
+}
+
 const void *acpi_device_get_match_data(const struct device *dev)
 {
+	const struct acpi_device_id *ids = acpi_device_get_ids(dev);
 	const struct acpi_device_id *match;
 
-	if (!dev->driver->acpi_match_table)
+	if (!ids)
 		return acpi_of_device_get_match_data(dev);
 
-	match = acpi_match_device(dev->driver->acpi_match_table, dev);
+	match = acpi_match_device(ids, dev);
 	if (!match)
 		return NULL;
 
-- 
2.35.1