mfd: intel-lpss: Use device_get_match_data()

Use preferred device_get_match_data() instead of acpi_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Introduce a temporary variable in PCI glue driver to be consistent with
ACPI one on the same matter.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231124200258.3682979-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 52ffc0d9c23f13b6fb17c78f49ca2a12ee90a75c..bba208235754e44e469971287e1cc767e6995b16 100644 (file)
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -8,9 +8,9 @@
  *          Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/acpi.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
@@ -169,16 +169,15 @@ MODULE_DEVICE_TABLE(acpi, intel_lpss_acpi_ids);
 
 static int intel_lpss_acpi_probe(struct platform_device *pdev)
 {
+       const struct intel_lpss_platform_info *data;
        struct intel_lpss_platform_info *info;
-       const struct acpi_device_id *id;
        int ret;
 
-       id = acpi_match_device(intel_lpss_acpi_ids, &pdev->dev);
-       if (!id)
+       data = device_get_match_data(&pdev->dev);
+       if (!data)
                return -ENODEV;
 
-       info = devm_kmemdup(&pdev->dev, (void *)id->driver_data, sizeof(*info),
-                           GFP_KERNEL);
+       info = devm_kmemdup(&pdev->dev, data, sizeof(*info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
 

diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
index 709b0fb4419de35e7c1b73aa8dbdba14cd4565ac..94042bfe7dbfb87ff3d86e5c89a30b1cf3cacf28 100644 (file)
--- a/drivers/mfd/intel-lpss-pci.c
+++ b/drivers/mfd/intel-lpss-pci.c
@@ -30,6 +30,7 @@ static const struct pci_device_id ignore_resource_conflicts_ids[] = {
 static int intel_lpss_pci_probe(struct pci_dev *pdev,
                                const struct pci_device_id *id)
 {
+       const struct intel_lpss_platform_info *data = (void *)id->driver_data;
        struct intel_lpss_platform_info *info;
        int ret;
 
@@ -41,8 +42,7 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev,
        if (ret)
                return ret;
 
-       info = devm_kmemdup(&pdev->dev, (void *)id->driver_data, sizeof(*info),
-                           GFP_KERNEL);
+       info = devm_kmemdup(&pdev->dev, data, sizeof(*info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;