Skip to content

Commit 7df699c

Browse files
Hans de GoedeHans Verkuil
authored andcommitted
media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
During DT-binding review for extending the V4L2 camera sensor privacy LED support to systems using devicetree, it has come up that having a "-led" suffix for the LED name / con_id is undesirable since it already is clear that it is a LED. Drop the "-led" suffix from the con_id in both the lookup table in the int3472 code, as well as from the con_id led_get() argument in the v4l2-subdev code. Signed-off-by: Hans de Goede <hansg@kernel.org> Acked-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
1 parent c90fad3 commit 7df699c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/media/v4l2-core/v4l2-subdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2608,7 +2608,7 @@ EXPORT_SYMBOL_GPL(v4l2_subdev_is_streaming);
26082608
int v4l2_subdev_get_privacy_led(struct v4l2_subdev *sd)
26092609
{
26102610
#if IS_REACHABLE(CONFIG_LEDS_CLASS)
2611-
sd->privacy_led = led_get(sd->dev, "privacy-led");
2611+
sd->privacy_led = led_get(sd->dev, "privacy");
26122612
if (IS_ERR(sd->privacy_led) && PTR_ERR(sd->privacy_led) != -ENOENT)
26132613
return dev_err_probe(sd->dev, PTR_ERR(sd->privacy_led),
26142614
"getting privacy LED\n");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp
4343

4444
int3472->pled.lookup.provider = int3472->pled.name;
4545
int3472->pled.lookup.dev_id = int3472->sensor_name;
46-
int3472->pled.lookup.con_id = "privacy-led";
46+
int3472->pled.lookup.con_id = "privacy";
4747
led_add_lookup(&int3472->pled.lookup);
4848

4949
return 0;

0 commit comments

Comments
 (0)