pinctrl: geminilake: Convert to use intel_pinctrl_probe_by_uid()

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

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>

diff --git a/drivers/pinctrl/intel/pinctrl-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c
index 5c4c967..10452e3 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-geminilake.c
+++ b/drivers/pinctrl/intel/pinctrl-geminilake.c
@@ -6,7 +6,7 @@
  * Author: 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>
@@ -449,33 +449,14 @@ static const struct intel_pinctrl_soc_data *glk_pinctrl_soc_data[] = {
 };
 
 static const struct acpi_device_id glk_pinctrl_acpi_match[] = {
-       { "INT3453" },
+       { "INT3453", (kernel_ulong_t)glk_pinctrl_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, glk_pinctrl_acpi_match);
 
 static int glk_pinctrl_probe(struct platform_device *pdev)
 {
-       const struct intel_pinctrl_soc_data *soc_data = NULL;
-       struct acpi_device *adev;
-       int i;
-
-       adev = ACPI_COMPANION(&pdev->dev);
-       if (!adev)
-               return -ENODEV;
-
-       for (i = 0; glk_pinctrl_soc_data[i]; i++) {
-               if (!strcmp(adev->pnp.unique_id,
-                           glk_pinctrl_soc_data[i]->uid)) {
-                       soc_data = glk_pinctrl_soc_data[i];
-                       break;
-               }
-       }
-
-       if (!soc_data)
-               return -ENODEV;
-
-       return intel_pinctrl_probe(pdev, soc_data);
+       return intel_pinctrl_probe_by_uid(pdev);
 }
 
 static const struct dev_pm_ops glk_pinctrl_pm_ops = {