diff mbox series

[v1,7/7] pinctrl: sunrisepoint: Convert to use device_get_match_data()

Message ID 20180820133513.79629-7-andriy.shevchenko@linux.intel.com
State New
Headers show
Series [v1,1/7] pinctrl: intel: Fix a spelling typo in kernel documentation | expand

Commit Message

Andy Shevchenko Aug. 20, 2018, 1:35 p.m. UTC 
Get rid of code duplication by converting to use device_get_match_data().

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
index 7984392104fe..aca60c7020d2 100644
--- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
+++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
@@ -7,10 +7,12 @@ 
  *          Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#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"
@@ -594,13 +596,8 @@  MODULE_DEVICE_TABLE(acpi, spt_pinctrl_acpi_match);
 static int spt_pinctrl_probe(struct platform_device *pdev)
 {
 	const struct intel_pinctrl_soc_data *soc_data;
-	const struct acpi_device_id *id;
-
-	id = acpi_match_device(spt_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);
 }