Unverified Commit 218d3c44 authored by Marco Nenciarini's avatar Marco Nenciarini Committed by Ilpo Järvinen
Browse files

platform/x86: int3472: Parameterize LED con_id in registration 



Add a con_id parameter to skl_int3472_register_led() to allow callers
to specify both the LED name suffix and lookup con_id instead of
hardcoding "privacy". This prepares for registering additional LED
types with different names.

While at it, rename the privacy LED's GPIO con_id from "privacy-led"
to "privacy" in int3472_get_con_id_and_polarity() and pass it
directly to skl_int3472_register_led(), reducing churn when adding
new LED types.

No functional change.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: default avatarMarco Nenciarini <mnencia@kcore.it>
Link: https://patch.msgid.link/20260401203638.1601661-4-mnencia@kcore.it


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 39237e32

drivers/platform/x86/intel/int3472/discrete.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void int3472_get_con_id_and_polarity(struct int3472_discrete_device *int3 
		*gpio_flags = GPIO_ACTIVE_HIGH;

		break;

	case INT3472_GPIO_TYPE_PRIVACY_LED:

		*con_id = "privacy-led";

		*con_id = "privacy";

		*gpio_flags = GPIO_ACTIVE_HIGH;

		break;

	case INT3472_GPIO_TYPE_HOTPLUG_DETECT:
@@ -354,7 +354,7 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, 


			break;

		case INT3472_GPIO_TYPE_PRIVACY_LED:

			ret = skl_int3472_register_led(int3472, gpio);

			ret = skl_int3472_register_led(int3472, gpio, con_id);

			if (ret)

				err_msg = "Failed to register LED\n";

drivers/platform/x86/intel/int3472/led.c

+4 −3
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ static int int3472_led_set(struct led_classdev *led_cdev, enum led_brightness br 
	return 0;

}



int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio)

int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio,

			     const char *con_id)

{

	struct int3472_led *led = &int3472->led;

	char *p;
@@ -27,7 +28,7 @@ int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpi 


	/* Generate the name, replacing the ':' in the ACPI devname with '_' */

	snprintf(led->name, sizeof(led->name),

		 "%s::privacy_led", acpi_dev_name(int3472->sensor));

		 "%s::%s_led", acpi_dev_name(int3472->sensor), con_id);

	p = strchr(led->name, ':');

	if (p)

		*p = '_';
@@ -42,7 +43,7 @@ int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpi 


	led->lookup.provider = led->name;

	led->lookup.dev_id = int3472->sensor_name;

	led->lookup.con_id = "privacy";

	led->lookup.con_id = con_id;

	led_add_lookup(&led->lookup);



	return 0;

include/linux/platform_data/x86/int3472.h

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ int skl_int3472_register_regulator(struct int3472_discrete_device *int3472, 
				   const char *second_sensor);

void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472);



int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio);

int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio,

			     const char *con_id);

void skl_int3472_unregister_led(struct int3472_discrete_device *int3472);



#endif