pinctrl: baytrail: Convert to use device_get_match_data()

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>
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-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index f38d596efa05f57c995d96094acb241cb48c67be..8aa03d102086c2492ab13afbac238a93725fb8a5 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -18,6 +18,8 @@
 #include <linux/seq_file.h>
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
+#include <linux/property.h>
+
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 #include <linux/pinctrl/pinconf.h>
@@ -1781,7 +1783,6 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
 {
        const struct byt_pinctrl_soc_data *soc_data = NULL;
        const struct byt_pinctrl_soc_data **soc_table;
-       const struct acpi_device_id *acpi_id;
        struct acpi_device *acpi_dev;
        struct byt_gpio *vg;
        int i, ret;
@@ -1790,11 +1791,7 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
        if (!acpi_dev)
                return -ENODEV;
 
-       acpi_id = acpi_match_device(byt_gpio_acpi_match, &pdev->dev);
-       if (!acpi_id)
-               return -ENODEV;
-
-       soc_table = (const struct byt_pinctrl_soc_data **)acpi_id->driver_data;
+       soc_table = (const struct byt_pinctrl_soc_data **)device_get_match_data(&pdev->dev);
 
        for (i = 0; soc_table[i]; i++) {
                if (!strcmp(acpi_dev->pnp.unique_id, soc_table[i]->uid)) {