pinctrl: intel: Check against matching data instead of ACPI companion

[ Upstream commit c551bd81d198bf1dcd4398d5454acdc0309dbe77 ]

In some cases we may get a platform device that has ACPI companion
which is different to the pin control described in the ACPI tables.
This is primarily happens when device is instantiated by board file.

In order to allow this device being enumerated, refactor
intel_pinctrl_get_soc_data() to check the matching data instead of
ACPI companion.

Reported-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Henning Schild <henning.schild@siemens.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 348c670a7b07d331acdcfd3ca58f5167379bdf28..4de832ac47d382c80c91e1094ca57d0b167a749c 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1571,16 +1571,14 @@ EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_uid);
 
 const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_device *pdev)
 {
+       const struct intel_pinctrl_soc_data * const *table;
        const struct intel_pinctrl_soc_data *data = NULL;
-       const struct intel_pinctrl_soc_data **table;
-       struct acpi_device *adev;
-       unsigned int i;
 
-       adev = ACPI_COMPANION(&pdev->dev);
-       if (adev) {
-               const void *match = device_get_match_data(&pdev->dev);
+       table = device_get_match_data(&pdev->dev);
+       if (table) {
+               struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+               unsigned int i;
 
-               table = (const struct intel_pinctrl_soc_data **)match;
                for (i = 0; table[i]; i++) {
                        if (!strcmp(adev->pnp.unique_id, table[i]->uid)) {
                                data = table[i];
@@ -1594,7 +1592,7 @@ const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_
                if (!id)
                        return ERR_PTR(-ENODEV);
 
-               table = (const struct intel_pinctrl_soc_data **)id->driver_data;
+               table = (const struct intel_pinctrl_soc_data * const *)id->driver_data;
                data = table[pdev->id];
        }