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>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 1da953629010b087fe7fcbc113cd3b1829824f1b..25e66bf18f5fc9b694604c0a570e3f4e83936f15 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -2608,7 +2608,7 @@ EXPORT_SYMBOL_GPL(v4l2_subdev_is_streaming);
 int v4l2_subdev_get_privacy_led(struct v4l2_subdev *sd)
 {
 #if IS_REACHABLE(CONFIG_LEDS_CLASS)
-       sd->privacy_led = led_get(sd->dev, "privacy-led");
+       sd->privacy_led = led_get(sd->dev, "privacy");
        if (IS_ERR(sd->privacy_led) && PTR_ERR(sd->privacy_led) != -ENOENT)
                return dev_err_probe(sd->dev, PTR_ERR(sd->privacy_led),
                                     "getting privacy LED\n");

diff --git a/drivers/platform/x86/intel/int3472/led.c b/drivers/platform/x86/intel/int3472/led.c
index f1d6d7b0cb75a38990cef1739ce055230de1f73f..b1d84b96811244ca5cb50aadfc43ae992ffbccba 100644 (file)
--- a/drivers/platform/x86/intel/int3472/led.c
+++ b/drivers/platform/x86/intel/int3472/led.c
@@ -43,7 +43,7 @@ int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp
 
        int3472->pled.lookup.provider = int3472->pled.name;
        int3472->pled.lookup.dev_id = int3472->sensor_name;
-       int3472->pled.lookup.con_id = "privacy-led";
+       int3472->pled.lookup.con_id = "privacy";
        led_add_lookup(&int3472->pled.lookup);
 
        return 0;