v4l2-subdev/int3472: Use "privacy" as con_id for the LED lookup
Hans de Goede
maintainerv2 cover v4l2-subdev/int3472: Use "privacy" as con_id for the LED lookup
Hi All,
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:
https://lore.kernel.org/linux-media/[email protected]/
There was discussion about making an exception for "privacy-led" since that is already used on x86/ACPI platforms, but I'm afraid that will set a bad example which ends up being copy and pasted, so lets just drop the "-led" prefix from the x86/ACPI side, which we can do since there this is only an in-kernel "API".
Changes in v2:
- Squash the changes into a single patch changing both places where "privacy-led" is used to "privacy" in one go
Ilpo can you give your ack for this patch getting merged through the linux-media tree?
Regards,
Hans
Hans de Goede (1):
media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the
privacy LED
drivers/media/v4l2-core/v4l2-subdev.c | 2 +- drivers/platform/x86/intel/int3472/led.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.51.0
Hans de Goede
maintainerPATCH v2 1/1 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.
--- drivers/media/v4l2-core/v4l2-subdev.c | 2 +- drivers/platform/x86/intel/int3472/led.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +1 -1
@@ -2602,7 +2602,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" );
drivers/platform/x86/intel/int3472/led.c +1 -1
@@ -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 ;
Signature · 1 line
2.51.0
Re: [PATCH v2 1/1] media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
Quoted 34 lines · Hans de Goede
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_idis undesirable since it already is clear that it is a LED.Drop the "-led" suffix from the
con_idin both the lookup table in the int3472 code, as well as from thecon_idled_get()argument in the v4l2-subdev code.Signed-off-by Hans de Goede <[email protected]>--- drivers/media/v4l2-core/v4l2-subdev.c | 2 +- drivers/platform/x86/intel/int3472/led.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +1
-1@@ -2602,7 +2602,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" );drivers/platform/x86/intel/int3472/led.c +0
-0
drivers/platform/x86/intel/int3472/led.c int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp · line 49
Quoted 8 lines
drivers/platform/x86/intel/int3472/led.c +1
-1@@ -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 ;
Signature · 1 line
i.
Re: [PATCH v2 1/1] media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
Quoted 44 lines · Ilpo Järvinen
Quoted 40 lines · Hans de Goede
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_idis undesirable since it already is clear that it is a LED.Drop the "-led" suffix from the
con_idin both the lookup table in the int3472 code, as well as from thecon_idled_get()argument in the v4l2-subdev code.Signed-off-by Hans de Goede [email protected]---
drivers/media/v4l2-core/v4l2-subdev.c| 2 +-drivers/platform/x86/intel/int3472/led.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +1
-1@@ -2602,7 +2602,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" );drivers/platform/x86/intel/int3472/led.c +1
-1@@ -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);
Quoted 5 lines
drivers/platform/x86/intel/int3472/led.c int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp · line 49
Quoted 1 line
drivers/platform/x86/intel/int3472/led.c +0
-0return 0 ;Acked-by Ilpo Järvinen [email protected]
Hi all,
Anything still pending before this patch can land? As DT-binding change that requires this [1] is already in linux-next it would be nice to land this in the same cycle.
Thanks,
Alex
[1] https://lore.kernel.org/all/[email protected]/
Quoted 3 lines
--
i.
Hans de Goede
maintainerRe: [PATCH v2 1/1] media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
Hi All,
Quoted 53 lines · Aleksandrs Vinarskis
Quoted 44 lines · Ilpo Järvinen
Quoted 40 lines · Hans de Goede
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_idis undesirable since it already is clear that it is a LED.Drop the "-led" suffix from the
con_idin both the lookup table in the int3472 code, as well as from thecon_idled_get()argument in the v4l2-subdev code.Signed-off-by Hans de Goede [email protected]---
drivers/media/v4l2-core/v4l2-subdev.c| 2 +-drivers/platform/x86/intel/int3472/led.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +1
-1@@ -2602,7 +2602,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" );drivers/platform/x86/intel/int3472/led.c +1
-1@@ -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);Quoted 5 lines
drivers/platform/x86/intel/int3472/led.c int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp · line 49
Quoted 1 line
drivers/platform/x86/intel/int3472/led.c +0
-0return 0 ;Acked-by Ilpo Järvinen [email protected]
Quoted 3 lines
Hi all,
Anything still pending before this patch can land? As DT-binding change that requires this [1] is already in linux-next it would be nice to land this in the same cycle.
Hmm, I was under the impression this was already merged but I do not see it in:
https://gitlab.freedesktop.org/linux-media/media-committers/
Sakari, can you pick this one up please, preferably for 6.18 ?
Regards,
Hans
Quoted 1 line
Sakari Ailus
maintainerRe: [PATCH v2 1/1] media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
Hi Hans, Aleksandrs,
Quoted 58 lines · Hans de Goede
Hi All,
Quoted 55 lines · Aleksandrs Vinarskis
Quoted 44 lines · Ilpo Järvinen
Quoted 40 lines · Hans de Goede
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_idis undesirable since it already is clear that it is a LED.Drop the "-led" suffix from the
con_idin both the lookup table in the int3472 code, as well as from thecon_idled_get()argument in the v4l2-subdev code.Signed-off-by Hans de Goede [email protected]---
drivers/media/v4l2-core/v4l2-subdev.c| 2 +-drivers/platform/x86/intel/int3472/led.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +1
-1@@ -2602,7 +2602,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" );drivers/platform/x86/intel/int3472/led.c +1
-1@@ -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);Quoted 5 lines
drivers/platform/x86/intel/int3472/led.c int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp · line 49
Quoted 1 line
drivers/platform/x86/intel/int3472/led.c +0
-0return 0 ;Acked-by Ilpo Järvinen [email protected]Hi all,
Quoted 8 lines
Quoted 1 line
Anything still pending before this patch can land? As DT-binding change that requires this [1] is already in linux-next it would be nice to land this in the same cycle.
Hmm, I was under the impression this was already merged but I do not see it in:
https://gitlab.freedesktop.org/linux-media/media-committers/
Sakari, can you pick this one up please, preferably for 6.18 ?
Is the related DT binding change going to be merged for v6.18? I had this queued for v6.19 but I don't see a problem with merging it as a fix for v6.18 either.
Signature · 3 lines
Regards, Sakari Ailus
Hans de Goede
maintainerRe: [PATCH v2 1/1] media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
Hi Sakari,
Quoted 63 lines · Sakari Ailus
Hi Hans, Aleksandrs,
Quoted 60 lines · Hans de Goede
Hi All,
Quoted 56 lines · Aleksandrs Vinarskis
Quoted 44 lines · Ilpo Järvinen
Quoted 40 lines · Hans de Goede
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_idis undesirable since it already is clear that it is a LED.Drop the "-led" suffix from the
con_idin both the lookup table in the int3472 code, as well as from thecon_idled_get()argument in the v4l2-subdev code.Signed-off-by Hans de Goede [email protected]---
drivers/media/v4l2-core/v4l2-subdev.c| 2 +-drivers/platform/x86/intel/int3472/led.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +1
-1@@ -2602,7 +2602,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" );drivers/platform/x86/intel/int3472/led.c +1
-1@@ -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);Quoted 5 lines
drivers/platform/x86/intel/int3472/led.c int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp · line 49
Quoted 1 line
drivers/platform/x86/intel/int3472/led.c +0
-0return 0 ;Acked-by Ilpo Järvinen [email protected]Hi all,
Anything still pending before this patch can land? As DT-binding change that requires this [1] is already in linux-next it would be nice to land this in the same cycle.
Quoted 8 lines
Quoted 6 lines
Hmm, I was under the impression this was already merged but I do not see it in:
https://gitlab.freedesktop.org/linux-media/media-committers/
Sakari, can you pick this one up please, preferably for 6.18 ?
Is the related DT binding change going to be merged for v6.18?
Just be clear / make sure we are on the same page 6.18 will be what is in -next now, so my request to merge this for 6.18 is a request to get this into -next before the merge-window which will open next Monday (or in the first fixes pull-req after the merge-window).
Quoted 2 lines
I had this queued for v6.19 but I don't see a problem with merging it as a fix for v6.18 either.
Again just to be clear, 6.19 is -next-next. Where as the DT changes are in the current next:
https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git/log/?h=for-leds-next
Regards,
Hans
Sakari Ailus
maintainerRe: [PATCH v2 1/1] media: v4l2-subdev / pdx86: int3472: Use "privacy" as con_id for the privacy LED
Hi Hans,
Quoted 73 lines · Hans de Goede
Hi Sakari,
Quoted 70 lines · Sakari Ailus
Hi Hans, Aleksandrs,
Quoted 66 lines · Hans de Goede
Hi All,
Quoted 53 lines · Aleksandrs Vinarskis
Quoted 44 lines · Ilpo Järvinen
Quoted 40 lines · Hans de Goede
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_idis undesirable since it already is clear that it is a LED.Drop the "-led" suffix from the
con_idin both the lookup table in the int3472 code, as well as from thecon_idled_get()argument in the v4l2-subdev code.Signed-off-by Hans de Goede [email protected]---
drivers/media/v4l2-core/v4l2-subdev.c| 2 +-drivers/platform/x86/intel/int3472/led.c| 2 +-2 files changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-subdev.c +1
-1@@ -2602,7 +2602,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" );drivers/platform/x86/intel/int3472/led.c +1
-1@@ -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);Quoted 5 lines
drivers/platform/x86/intel/int3472/led.c int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gp · line 49
Quoted 1 line
drivers/platform/x86/intel/int3472/led.c +0
-0return 0 ;Acked-by Ilpo Järvinen [email protected]Quoted 3 lines
Hi all,
Anything still pending before this patch can land? As DT-binding change that requires this [1] is already in linux-next it would be nice to land this in the same cycle.
Hmm, I was under the impression this was already merged but I do not see it in:
https://gitlab.freedesktop.org/linux-media/media-committers/
Sakari, can you pick this one up please, preferably for 6.18 ?
Quoted 6 lines
Quoted 1 line
Is the related DT binding change going to be merged for v6.18?
Just be clear / make sure we are on the same page 6.18 will be what is in -next now, so my request to merge this for 6.18 is a request to get this into -next before the merge-window which will open next Monday (or in the first fixes pull-req after the merge-window).
Ack, I'll pick this as a fix for v6.18.
Signature · 3 lines
Kind regards, Sakari Ailus