linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 10/31] media: radio: changing LED_* from enum led_brightness to actual value
       [not found] <20220121165436.30956-1-sampaio.ime@gmail.com>
@ 2022-01-21 16:54 ` Luiz Sampaio
  2022-01-21 16:54 ` [PATCH 11/31] media: rc: " Luiz Sampaio
  2022-01-21 16:54 ` [PATCH 12/31] media: v4l2-core: " Luiz Sampaio
  2 siblings, 0 replies; 6+ messages in thread
From: Luiz Sampaio @ 2022-01-21 16:54 UTC (permalink / raw)
  To: Hans Verkuil, Mauro Carvalho Chehab
  Cc: linux-kernel, Luiz Sampaio, linux-media

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/media/radio/radio-shark.c  | 6 +++---
 drivers/media/radio/radio-shark2.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index 8230da828d0e..7998b75df525 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -217,19 +217,19 @@ static void shark_led_set_red(struct led_classdev *led_cdev,
 static const struct led_classdev shark_led_templates[NO_LEDS] = {
 	[BLUE_LED] = {
 		.name		= "%s:blue:",
-		.brightness	= LED_OFF,
+		.brightness	= 0,
 		.max_brightness = 127,
 		.brightness_set = shark_led_set_blue,
 	},
 	[BLUE_PULSE_LED] = {
 		.name		= "%s:blue-pulse:",
-		.brightness	= LED_OFF,
+		.brightness	= 0,
 		.max_brightness = 255,
 		.brightness_set = shark_led_set_blue_pulse,
 	},
 	[RED_LED] = {
 		.name		= "%s:red:",
-		.brightness	= LED_OFF,
+		.brightness	= 0,
 		.max_brightness = 1,
 		.brightness_set = shark_led_set_red,
 	},
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index d150f12382c6..776877a294d8 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -189,13 +189,13 @@ static void shark_led_set_red(struct led_classdev *led_cdev,
 static const struct led_classdev shark_led_templates[NO_LEDS] = {
 	[BLUE_LED] = {
 		.name		= "%s:blue:",
-		.brightness	= LED_OFF,
+		.brightness	= 0,
 		.max_brightness = 127,
 		.brightness_set = shark_led_set_blue,
 	},
 	[RED_LED] = {
 		.name		= "%s:red:",
-		.brightness	= LED_OFF,
+		.brightness	= 0,
 		.max_brightness = 1,
 		.brightness_set = shark_led_set_red,
 	},
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 11/31] media: rc: changing LED_* from enum led_brightness to actual value
       [not found] <20220121165436.30956-1-sampaio.ime@gmail.com>
  2022-01-21 16:54 ` [PATCH 10/31] media: radio: changing LED_* from enum led_brightness to actual value Luiz Sampaio
@ 2022-01-21 16:54 ` Luiz Sampaio
  2022-01-21 18:06   ` Sean Young
  2022-01-21 16:54 ` [PATCH 12/31] media: v4l2-core: " Luiz Sampaio
  2 siblings, 1 reply; 6+ messages in thread
From: Luiz Sampaio @ 2022-01-21 16:54 UTC (permalink / raw)
  To: Sean Young, Mauro Carvalho Chehab, David Härdeman
  Cc: linux-kernel, Luiz Sampaio, linux-media

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/media/rc/rc-main.c     | 4 ++--
 drivers/media/rc/redrat3.c     | 4 ++--
 drivers/media/rc/ttusbir.c     | 4 ++--
 drivers/media/rc/winbond-cir.c | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index b90438a71c80..76580f1920e2 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -641,7 +641,7 @@ static void ir_do_keyup(struct rc_dev *dev, bool sync)
 	dev_dbg(&dev->dev, "keyup key 0x%04x\n", dev->last_keycode);
 	del_timer(&dev->timer_repeat);
 	input_report_key(dev->input_dev, dev->last_keycode, 0);
-	led_trigger_event(led_feedback, LED_OFF);
+	led_trigger_event(led_feedback, 0);
 	if (sync)
 		input_sync(dev->input_dev);
 	dev->keypressed = false;
@@ -812,7 +812,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_proto protocol,
 			dev->device_name, keycode, protocol, scancode);
 		input_report_key(dev->input_dev, keycode, 1);
 
-		led_trigger_event(led_feedback, LED_FULL);
+		led_trigger_event(led_feedback, 255);
 	}
 
 	/*
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index cb22316b3f00..7c255f7d790c 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -855,7 +855,7 @@ static void redrat3_brightness_set(struct led_classdev *led_dev, enum
 	struct redrat3_dev *rr3 = container_of(led_dev, struct redrat3_dev,
 									led);
 
-	if (brightness != LED_OFF && atomic_cmpxchg(&rr3->flash, 0, 1) == 0) {
+	if (brightness != 0 && atomic_cmpxchg(&rr3->flash, 0, 1) == 0) {
 		int ret = usb_submit_urb(rr3->flash_urb, GFP_ATOMIC);
 		if (ret != 0) {
 			dev_dbg(rr3->dev, "%s: unexpected ret of %d\n",
@@ -919,7 +919,7 @@ static void redrat3_led_complete(struct urb *urb)
 		break;
 	}
 
-	rr3->led.brightness = LED_OFF;
+	rr3->led.brightness = 0;
 	atomic_dec(&rr3->flash);
 }
 
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index 629787d53ee1..a295112644c3 100644
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -44,7 +44,7 @@ static enum led_brightness ttusbir_brightness_get(struct led_classdev *led_dev)
 {
 	struct ttusbir *tt = container_of(led_dev, struct ttusbir, led);
 
-	return tt->led_on ? LED_FULL : LED_OFF;
+	return tt->led_on ? 255 : 0;
 }
 
 static void ttusbir_set_led(struct ttusbir *tt)
@@ -70,7 +70,7 @@ static void ttusbir_brightness_set(struct led_classdev *led_dev, enum
 {
 	struct ttusbir *tt = container_of(led_dev, struct ttusbir, led);
 
-	tt->led_on = brightness != LED_OFF;
+	tt->led_on = brightness != 0;
 
 	ttusbir_set_led(tt);
 }
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 94efb035d21b..d14e495a8641 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -265,7 +265,7 @@ wbcir_led_brightness_get(struct led_classdev *led_cdev)
 	if (inb(data->ebase + WBCIR_REG_ECEIR_CTS) & WBCIR_LED_ENABLE)
 		return LED_FULL;
 	else
-		return LED_OFF;
+		return 0;
 }
 
 static void
@@ -277,7 +277,7 @@ wbcir_led_brightness_set(struct led_classdev *led_cdev,
 					       led);
 
 	wbcir_set_bits(data->ebase + WBCIR_REG_ECEIR_CTS,
-		       brightness == LED_OFF ? 0x00 : WBCIR_LED_ENABLE,
+		       brightness == 0 ? 0x00 : WBCIR_LED_ENABLE,
 		       WBCIR_LED_ENABLE);
 }
 
@@ -1167,7 +1167,7 @@ wbcir_remove(struct pnp_dev *device)
 	led_classdev_unregister(&data->led);
 
 	/* This is ok since &data->led isn't actually used */
-	wbcir_led_brightness_set(&data->led, LED_OFF);
+	wbcir_led_brightness_set(&data->led, 0);
 
 	release_region(data->wbase, WAKEUP_IOMEM_LEN);
 	release_region(data->ebase, EHFUNC_IOMEM_LEN);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 12/31] media: v4l2-core: changing LED_* from enum led_brightness to actual value
       [not found] <20220121165436.30956-1-sampaio.ime@gmail.com>
  2022-01-21 16:54 ` [PATCH 10/31] media: radio: changing LED_* from enum led_brightness to actual value Luiz Sampaio
  2022-01-21 16:54 ` [PATCH 11/31] media: rc: " Luiz Sampaio
@ 2022-01-21 16:54 ` Luiz Sampaio
  2022-02-02 12:54   ` Sakari Ailus
  2022-11-26 10:14   ` Hans Verkuil
  2 siblings, 2 replies; 6+ messages in thread
From: Luiz Sampaio @ 2022-01-21 16:54 UTC (permalink / raw)
  To: Mauro Carvalho Chehab; +Cc: linux-kernel, Luiz Sampaio, linux-media

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/media/v4l2-core/v4l2-flash-led-class.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
index e70e128ccc9c..a47ac654c9f4 100644
--- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
+++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
@@ -234,11 +234,11 @@ static int v4l2_flash_s_ctrl(struct v4l2_ctrl *c)
 	case V4L2_CID_FLASH_LED_MODE:
 		switch (c->val) {
 		case V4L2_FLASH_LED_MODE_NONE:
-			led_set_brightness_sync(led_cdev, LED_OFF);
+			led_set_brightness_sync(led_cdev, 0);
 			return led_set_flash_strobe(fled_cdev, false);
 		case V4L2_FLASH_LED_MODE_FLASH:
 			/* Turn the torch LED off */
-			led_set_brightness_sync(led_cdev, LED_OFF);
+			led_set_brightness_sync(led_cdev, 0);
 			if (ctrls[STROBE_SOURCE]) {
 				external_strobe = (ctrls[STROBE_SOURCE]->val ==
 					V4L2_FLASH_STROBE_SOURCE_EXTERNAL);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 11/31] media: rc: changing LED_* from enum led_brightness to actual value
  2022-01-21 16:54 ` [PATCH 11/31] media: rc: " Luiz Sampaio
@ 2022-01-21 18:06   ` Sean Young
  0 siblings, 0 replies; 6+ messages in thread
From: Sean Young @ 2022-01-21 18:06 UTC (permalink / raw)
  To: Luiz Sampaio
  Cc: Mauro Carvalho Chehab, David Härdeman, linux-kernel, linux-media

On Fri, Jan 21, 2022 at 01:54:16PM -0300, Luiz Sampaio wrote:
> The enum led_brightness, which contains the declaration of LED_OFF,
> LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
> max_brightness.
> ---
>  drivers/media/rc/rc-main.c     | 4 ++--
>  drivers/media/rc/redrat3.c     | 4 ++--
>  drivers/media/rc/ttusbir.c     | 4 ++--
>  drivers/media/rc/winbond-cir.c | 6 +++---
>  4 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
> index b90438a71c80..76580f1920e2 100644
> --- a/drivers/media/rc/rc-main.c
> +++ b/drivers/media/rc/rc-main.c
> @@ -641,7 +641,7 @@ static void ir_do_keyup(struct rc_dev *dev, bool sync)
>  	dev_dbg(&dev->dev, "keyup key 0x%04x\n", dev->last_keycode);
>  	del_timer(&dev->timer_repeat);
>  	input_report_key(dev->input_dev, dev->last_keycode, 0);
> -	led_trigger_event(led_feedback, LED_OFF);
> +	led_trigger_event(led_feedback, 0);
>  	if (sync)
>  		input_sync(dev->input_dev);
>  	dev->keypressed = false;
> @@ -812,7 +812,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_proto protocol,
>  			dev->device_name, keycode, protocol, scancode);
>  		input_report_key(dev->input_dev, keycode, 1);
>  
> -		led_trigger_event(led_feedback, LED_FULL);
> +		led_trigger_event(led_feedback, 255);
>  	}
>  
>  	/*
> diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
> index cb22316b3f00..7c255f7d790c 100644
> --- a/drivers/media/rc/redrat3.c
> +++ b/drivers/media/rc/redrat3.c
> @@ -855,7 +855,7 @@ static void redrat3_brightness_set(struct led_classdev *led_dev, enum
>  	struct redrat3_dev *rr3 = container_of(led_dev, struct redrat3_dev,
>  									led);
>  
> -	if (brightness != LED_OFF && atomic_cmpxchg(&rr3->flash, 0, 1) == 0) {
> +	if (brightness != 0 && atomic_cmpxchg(&rr3->flash, 0, 1) == 0) {
>  		int ret = usb_submit_urb(rr3->flash_urb, GFP_ATOMIC);
>  		if (ret != 0) {
>  			dev_dbg(rr3->dev, "%s: unexpected ret of %d\n",
> @@ -919,7 +919,7 @@ static void redrat3_led_complete(struct urb *urb)
>  		break;
>  	}
>  
> -	rr3->led.brightness = LED_OFF;
> +	rr3->led.brightness = 0;
>  	atomic_dec(&rr3->flash);
>  }
>  
> diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
> index 629787d53ee1..a295112644c3 100644
> --- a/drivers/media/rc/ttusbir.c
> +++ b/drivers/media/rc/ttusbir.c
> @@ -44,7 +44,7 @@ static enum led_brightness ttusbir_brightness_get(struct led_classdev *led_dev)
>  {
>  	struct ttusbir *tt = container_of(led_dev, struct ttusbir, led);
>  
> -	return tt->led_on ? LED_FULL : LED_OFF;
> +	return tt->led_on ? 255 : 0;
>  }
>  
>  static void ttusbir_set_led(struct ttusbir *tt)
> @@ -70,7 +70,7 @@ static void ttusbir_brightness_set(struct led_classdev *led_dev, enum
>  {
>  	struct ttusbir *tt = container_of(led_dev, struct ttusbir, led);
>  
> -	tt->led_on = brightness != LED_OFF;
> +	tt->led_on = brightness != 0;
>  
>  	ttusbir_set_led(tt);
>  }
> diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
> index 94efb035d21b..d14e495a8641 100644
> --- a/drivers/media/rc/winbond-cir.c
> +++ b/drivers/media/rc/winbond-cir.c
> @@ -265,7 +265,7 @@ wbcir_led_brightness_get(struct led_classdev *led_cdev)
>  	if (inb(data->ebase + WBCIR_REG_ECEIR_CTS) & WBCIR_LED_ENABLE)
>  		return LED_FULL;

You missed this one.

Thanks
Sean

>  	else
> -		return LED_OFF;
> +		return 0;
>  }
>  
>  static void
> @@ -277,7 +277,7 @@ wbcir_led_brightness_set(struct led_classdev *led_cdev,
>  					       led);
>  
>  	wbcir_set_bits(data->ebase + WBCIR_REG_ECEIR_CTS,
> -		       brightness == LED_OFF ? 0x00 : WBCIR_LED_ENABLE,
> +		       brightness == 0 ? 0x00 : WBCIR_LED_ENABLE,
>  		       WBCIR_LED_ENABLE);
>  }
>  
> @@ -1167,7 +1167,7 @@ wbcir_remove(struct pnp_dev *device)
>  	led_classdev_unregister(&data->led);
>  
>  	/* This is ok since &data->led isn't actually used */
> -	wbcir_led_brightness_set(&data->led, LED_OFF);
> +	wbcir_led_brightness_set(&data->led, 0);
>  
>  	release_region(data->wbase, WAKEUP_IOMEM_LEN);
>  	release_region(data->ebase, EHFUNC_IOMEM_LEN);
> -- 
> 2.34.1

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 12/31] media: v4l2-core: changing LED_* from enum led_brightness to actual value
  2022-01-21 16:54 ` [PATCH 12/31] media: v4l2-core: " Luiz Sampaio
@ 2022-02-02 12:54   ` Sakari Ailus
  2022-11-26 10:14   ` Hans Verkuil
  1 sibling, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2022-02-02 12:54 UTC (permalink / raw)
  To: Luiz Sampaio; +Cc: Mauro Carvalho Chehab, linux-kernel, linux-media

Hi Luiz,

On Fri, Jan 21, 2022 at 01:54:17PM -0300, Luiz Sampaio wrote:
> The enum led_brightness, which contains the declaration of LED_OFF,
> LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
> max_brightness.

The set appears to be missing the Signed-off-by: line, at least in the
three patches cc'd to the linux-media list.

With this fixed, for this patch:

Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

> ---
>  drivers/media/v4l2-core/v4l2-flash-led-class.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> index e70e128ccc9c..a47ac654c9f4 100644
> --- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
> +++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> @@ -234,11 +234,11 @@ static int v4l2_flash_s_ctrl(struct v4l2_ctrl *c)
>  	case V4L2_CID_FLASH_LED_MODE:
>  		switch (c->val) {
>  		case V4L2_FLASH_LED_MODE_NONE:
> -			led_set_brightness_sync(led_cdev, LED_OFF);
> +			led_set_brightness_sync(led_cdev, 0);
>  			return led_set_flash_strobe(fled_cdev, false);
>  		case V4L2_FLASH_LED_MODE_FLASH:
>  			/* Turn the torch LED off */
> -			led_set_brightness_sync(led_cdev, LED_OFF);
> +			led_set_brightness_sync(led_cdev, 0);
>  			if (ctrls[STROBE_SOURCE]) {
>  				external_strobe = (ctrls[STROBE_SOURCE]->val ==
>  					V4L2_FLASH_STROBE_SOURCE_EXTERNAL);

-- 
Regards,

Sakari Ailus

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 12/31] media: v4l2-core: changing LED_* from enum led_brightness to actual value
  2022-01-21 16:54 ` [PATCH 12/31] media: v4l2-core: " Luiz Sampaio
  2022-02-02 12:54   ` Sakari Ailus
@ 2022-11-26 10:14   ` Hans Verkuil
  1 sibling, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2022-11-26 10:14 UTC (permalink / raw)
  To: Luiz Sampaio, Mauro Carvalho Chehab; +Cc: linux-kernel, linux-media

Hi Luiz,

On 21/01/2022 17:54, Luiz Sampaio wrote:
> The enum led_brightness, which contains the declaration of LED_OFF,
> LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
> max_brightness.

Note that there is no Signed-off-by line, so I can't take this.

Same for patches 11/31 and 10/31.

If this is still relevant (it's an old series, after all), then please
repost.

Regards,

	Hans

> ---
>  drivers/media/v4l2-core/v4l2-flash-led-class.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> index e70e128ccc9c..a47ac654c9f4 100644
> --- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
> +++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> @@ -234,11 +234,11 @@ static int v4l2_flash_s_ctrl(struct v4l2_ctrl *c)
>  	case V4L2_CID_FLASH_LED_MODE:
>  		switch (c->val) {
>  		case V4L2_FLASH_LED_MODE_NONE:
> -			led_set_brightness_sync(led_cdev, LED_OFF);
> +			led_set_brightness_sync(led_cdev, 0);
>  			return led_set_flash_strobe(fled_cdev, false);
>  		case V4L2_FLASH_LED_MODE_FLASH:
>  			/* Turn the torch LED off */
> -			led_set_brightness_sync(led_cdev, LED_OFF);
> +			led_set_brightness_sync(led_cdev, 0);
>  			if (ctrls[STROBE_SOURCE]) {
>  				external_strobe = (ctrls[STROBE_SOURCE]->val ==
>  					V4L2_FLASH_STROBE_SOURCE_EXTERNAL);


^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-26 10:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20220121165436.30956-1-sampaio.ime@gmail.com>
2022-01-21 16:54 ` [PATCH 10/31] media: radio: changing LED_* from enum led_brightness to actual value Luiz Sampaio
2022-01-21 16:54 ` [PATCH 11/31] media: rc: " Luiz Sampaio
2022-01-21 18:06   ` Sean Young
2022-01-21 16:54 ` [PATCH 12/31] media: v4l2-core: " Luiz Sampaio
2022-02-02 12:54   ` Sakari Ailus
2022-11-26 10:14   ` Hans Verkuil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).