[PATCH v1 6/7] pinctrl: cannonlake: Convert to use device_get_match_data()

[Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>]

Get rid of code duplication by converting to use device_get_match_data().

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
 drivers/pinctrl/intel/pinctrl-cannonlake.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c
index fb1afe55bf53..b9ea33601d25 100644
--- a/drivers/pinctrl/intel/pinctrl-cannonlake.c
+++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c
@@ -7,10 +7,12 @@
  *          Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
  */
 
-#include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/property.h>
+
 #include <linux/pinctrl/pinctrl.h>
 
 #include "pinctrl-intel.h"
@@ -829,13 +831,8 @@ MODULE_DEVICE_TABLE(acpi, cnl_pinctrl_acpi_match);
 static int cnl_pinctrl_probe(struct platform_device *pdev)
 {
 	const struct intel_pinctrl_soc_data *soc_data;
-	const struct acpi_device_id *id;
-
-	id = acpi_match_device(cnl_pinctrl_acpi_match, &pdev->dev);
-	if (!id || !id->driver_data)
-		return -ENODEV;
 
-	soc_data = (const struct intel_pinctrl_soc_data *)id->driver_data;
+	soc_data = device_get_match_data(&pdev->dev);
 	return intel_pinctrl_probe(pdev, soc_data);
 }
 
-- 
2.18.0