platform/x86: int3472: Call "func" "con_id" instead

"con_id" is an established variable name for the GPIO naming for drivers.
Use it instead of "func" in the int3472 driver, too.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250211072841.7713-4-sakari.ailus@linux.intel.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index 092252eb95a870a292d4d6a0b4a5f819cd4ff2ef..30ff8f3ea1f53298e39677604c3e3c6d1dd79edb 100644 (file)
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -56,7 +56,7 @@ static void skl_int3472_log_sensor_module_name(struct int3472_discrete_device *i
 
 static int skl_int3472_fill_gpiod_lookup(struct gpiod_lookup *table_entry,
                                         struct acpi_resource_gpio *agpio,
-                                        const char *func, unsigned long gpio_flags)
+                                        const char *con_id, unsigned long gpio_flags)
 {
        char *path = agpio->resource_source.string_ptr;
        struct acpi_device *adev;
@@ -71,14 +71,14 @@ static int skl_int3472_fill_gpiod_lookup(struct gpiod_lookup *table_entry,
        if (!adev)
                return -ENODEV;
 
-       *table_entry = GPIO_LOOKUP(acpi_dev_name(adev), agpio->pin_table[0], func, gpio_flags);
+       *table_entry = GPIO_LOOKUP(acpi_dev_name(adev), agpio->pin_table[0], con_id, gpio_flags);
 
        return 0;
 }
 
 static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int3472,
                                          struct acpi_resource_gpio *agpio,
-                                         const char *func, unsigned long gpio_flags)
+                                         const char *con_id, unsigned long gpio_flags)
 {
        int ret;
 
@@ -88,7 +88,7 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
        }
 
        ret = skl_int3472_fill_gpiod_lookup(&int3472->gpios.table[int3472->n_sensor_gpios],
-                                           agpio, func, gpio_flags);
+                                           agpio, con_id, gpio_flags);
        if (ret)
                return ret;
 
@@ -101,7 +101,7 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
 static struct gpio_desc *
 skl_int3472_gpiod_get_from_temp_lookup(struct int3472_discrete_device *int3472,
                                       struct acpi_resource_gpio *agpio,
-                                      const char *func, unsigned long gpio_flags)
+                                      const char *con_id, unsigned long gpio_flags)
 {
        struct gpio_desc *desc;
        int ret;
@@ -112,12 +112,12 @@ skl_int3472_gpiod_get_from_temp_lookup(struct int3472_discrete_device *int3472,
                return ERR_PTR(-ENOMEM);
 
        lookup->dev_id = dev_name(int3472->dev);
-       ret = skl_int3472_fill_gpiod_lookup(&lookup->table[0], agpio, func, gpio_flags);
+       ret = skl_int3472_fill_gpiod_lookup(&lookup->table[0], agpio, con_id, gpio_flags);
        if (ret)
                return ERR_PTR(ret);
 
        gpiod_add_lookup_table(lookup);
-       desc = devm_gpiod_get(int3472->dev, func, GPIOD_OUT_LOW);
+       desc = devm_gpiod_get(int3472->dev, con_id, GPIOD_OUT_LOW);
        gpiod_remove_lookup_table(lookup);
 
        return desc;
@@ -129,7 +129,7 @@ skl_int3472_gpiod_get_from_temp_lookup(struct int3472_discrete_device *int3472,
  * @hid: The ACPI HID of the device without the instance number e.g. INT347E
  * @type_from: The GPIO type from ACPI ?SDT
  * @type_to: The assigned GPIO type, typically same as @type_from
- * @func: The function, e.g. "enable"
+ * @con_id: The name of the GPIO for the device
  * @polarity_low: GPIO_ACTIVE_LOW true if the @polarity_low is true,
  * GPIO_ACTIVE_HIGH otherwise
  */
@@ -138,15 +138,15 @@ struct int3472_gpio_map {
        u8 type_from;
        u8 type_to;
        bool polarity_low;
-       const char *func;
+       const char *con_id;
 };
 
 static const struct int3472_gpio_map int3472_gpio_map[] = {
        { "INT347E", INT3472_GPIO_TYPE_RESET, INT3472_GPIO_TYPE_RESET, false, "enable" },
 };
 
-static void int3472_get_func_and_polarity(struct acpi_device *adev, u8 *type,
-                                         const char **func, unsigned long *gpio_flags)
+static void int3472_get_con_id_and_polarity(struct acpi_device *adev, u8 *type,
+                                           const char **con_id, unsigned long *gpio_flags)
 {
        unsigned int i;
 
@@ -165,33 +165,33 @@ static void int3472_get_func_and_polarity(struct acpi_device *adev, u8 *type,
                *type = int3472_gpio_map[i].type_to;
                *gpio_flags = int3472_gpio_map[i].polarity_low ?
                              GPIO_ACTIVE_LOW : GPIO_ACTIVE_HIGH;
-               *func = int3472_gpio_map[i].func;
+               *con_id = int3472_gpio_map[i].con_id;
                return;
        }
 
        switch (*type) {
        case INT3472_GPIO_TYPE_RESET:
-               *func = "reset";
+               *con_id = "reset";
                *gpio_flags = GPIO_ACTIVE_LOW;
                break;
        case INT3472_GPIO_TYPE_POWERDOWN:
-               *func = "powerdown";
+               *con_id = "powerdown";
                *gpio_flags = GPIO_ACTIVE_LOW;
                break;
        case INT3472_GPIO_TYPE_CLK_ENABLE:
-               *func = "clk-enable";
+               *con_id = "clk-enable";
                *gpio_flags = GPIO_ACTIVE_HIGH;
                break;
        case INT3472_GPIO_TYPE_PRIVACY_LED:
-               *func = "privacy-led";
+               *con_id = "privacy-led";
                *gpio_flags = GPIO_ACTIVE_HIGH;
                break;
        case INT3472_GPIO_TYPE_POWER_ENABLE:
-               *func = "power-enable";
+               *con_id = "power-enable";
                *gpio_flags = GPIO_ACTIVE_HIGH;
                break;
        default:
-               *func = "unknown";
+               *con_id = "unknown";
                *gpio_flags = GPIO_ACTIVE_HIGH;
                break;
        }
@@ -238,7 +238,7 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
        union acpi_object *obj;
        struct gpio_desc *gpio;
        const char *err_msg;
-       const char *func;
+       const char *con_id;
        unsigned long gpio_flags;
        int ret;
 
@@ -262,26 +262,26 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 
        type = FIELD_GET(INT3472_GPIO_DSM_TYPE, obj->integer.value);
 
-       int3472_get_func_and_polarity(int3472->sensor, &type, &func, &gpio_flags);
+       int3472_get_con_id_and_polarity(int3472->sensor, &type, &con_id, &gpio_flags);
 
        pin = FIELD_GET(INT3472_GPIO_DSM_PIN, obj->integer.value);
        /* Pin field is not really used under Windows and wraps around at 8 bits */
        if (pin != (agpio->pin_table[0] & 0xff))
                dev_dbg(int3472->dev, FW_BUG "%s %s pin number mismatch _DSM %d resource %d\n",
-                       func, agpio->resource_source.string_ptr, pin, agpio->pin_table[0]);
+                       con_id, agpio->resource_source.string_ptr, pin, agpio->pin_table[0]);
 
        active_value = FIELD_GET(INT3472_GPIO_DSM_SENSOR_ON_VAL, obj->integer.value);
        if (!active_value)
                gpio_flags ^= GPIO_ACTIVE_LOW;
 
-       dev_dbg(int3472->dev, "%s %s pin %d active-%s\n", func,
+       dev_dbg(int3472->dev, "%s %s pin %d active-%s\n", con_id,
                agpio->resource_source.string_ptr, agpio->pin_table[0],
                str_high_low(gpio_flags == GPIO_ACTIVE_HIGH));
 
        switch (type) {
        case INT3472_GPIO_TYPE_RESET:
        case INT3472_GPIO_TYPE_POWERDOWN:
-               ret = skl_int3472_map_gpio_to_sensor(int3472, agpio, func, gpio_flags);
+               ret = skl_int3472_map_gpio_to_sensor(int3472, agpio, con_id, gpio_flags);
                if (ret)
                        err_msg = "Failed to map GPIO pin to sensor\n";
 
@@ -289,7 +289,7 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
        case INT3472_GPIO_TYPE_CLK_ENABLE:
        case INT3472_GPIO_TYPE_PRIVACY_LED:
        case INT3472_GPIO_TYPE_POWER_ENABLE:
-               gpio = skl_int3472_gpiod_get_from_temp_lookup(int3472, agpio, func, gpio_flags);
+               gpio = skl_int3472_gpiod_get_from_temp_lookup(int3472, agpio, con_id, gpio_flags);
                if (IS_ERR(gpio)) {
                        ret = PTR_ERR(gpio);
                        err_msg = "Failed to get GPIO\n";