pinctrl: intel: Refactor intel_pinctrl_get_soc_data()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 30 Oct 2023 15:59:06 +0000 (17:59 +0200)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 13 Nov 2023 11:56:42 +0000 (13:56 +0200)
Refactor intel_pinctrl_get_soc_data() to drop initial assignment
of the data variable. It's only used in ACPI case and instead
we may always assign it there as the ACPI ID table has the terminator
entry that has driver data set to NULL.

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/pinctrl/intel/pinctrl-intel.c

index e8b41a3..62daf18 100644 (file)
@@ -1651,7 +1651,7 @@ EXPORT_SYMBOL_NS_GPL(intel_pinctrl_probe_by_uid, PINCTRL_INTEL);
 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 *data;
        struct device *dev = &pdev->dev;
 
        table = device_get_match_data(dev);
@@ -1660,11 +1660,10 @@ const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_
                unsigned int i;
 
                for (i = 0; table[i]; i++) {
-                       if (acpi_dev_uid_match(adev, table[i]->uid)) {
-                               data = table[i];
+                       if (acpi_dev_uid_match(adev, table[i]->uid))
                                break;
-                       }
                }
+               data = table[i];
        } else {
                const struct platform_device_id *id;