summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-08-30 19:27:42 +0300
committerLinus Walleij <linus.walleij@linaro.org>2018-08-31 11:25:19 +0200
commit0c03e92e7d665b01afbddf057b2cc07587ffc2cc (patch)
tree765abaac77e98e690ae1f00abc049908c3216465 /drivers/pinctrl/intel/pinctrl-sunrisepoint.c
parentc98a96672b106b2563cebf1b8137c51f41b808ae (diff)
downloadlinux-sh-0c03e92e7d665b01afbddf057b2cc07587ffc2cc.tar.gz
pinctrl: sunrisepoint: Convert to use intel_pinctrl_probe_by_hid()
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>
Diffstat (limited to 'drivers/pinctrl/intel/pinctrl-sunrisepoint.c')
-rw-r--r--drivers/pinctrl/intel/pinctrl-sunrisepoint.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
index 7984392104fe..c7b5272fd927 100644
--- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
+++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
@@ -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 = {