OSDN Git Service

pinctrl: sunrisepoint: Convert to use intel_pinctrl_probe_by_hid()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 30 Aug 2018 16:27:42 +0000 (19:27 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 31 Aug 2018 09:25:19 +0000 (11:25 +0200)
Get rid of code duplication by converting to use intel_pinctrl_probe_by_hid().

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/intel/pinctrl-sunrisepoint.c

index 7984392..c7b5272 100644 (file)
@@ -7,10 +7,11 @@
  *          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/pinctrl/pinctrl.h>
 
 #include "pinctrl-intel.h"
@@ -593,15 +594,7 @@ 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;
-       return intel_pinctrl_probe(pdev, soc_data);
+       return intel_pinctrl_probe_by_hid(pdev);
 }
 
 static const struct dev_pm_ops spt_pinctrl_pm_ops = {