[PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[Jacek Anaszewski]

LED subsystem shifted responsibility for choosing between SYNC or ASYNC
way of setting brightness from drivers to the caller. Adapt the wrapper
to those changes.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: linux-media@vger.kernel.org
---
 drivers/media/v4l2-core/v4l2-flash-led-class.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
index 5bdfb8d..5d67335 100644
--- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
+++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
@@ -107,10 +107,10 @@ static void v4l2_flash_set_led_brightness(struct v4l2_flash *v4l2_flash,
 		if (ctrls[LED_MODE]->val != V4L2_FLASH_LED_MODE_TORCH)
 			return;
 
-		led_set_brightness(&v4l2_flash->fled_cdev->led_cdev,
+		led_set_brightness_sync(&v4l2_flash->fled_cdev->led_cdev,
 					brightness);
 	} else {
-		led_set_brightness(&v4l2_flash->iled_cdev->led_cdev,
+		led_set_brightness_sync(&v4l2_flash->iled_cdev->led_cdev,
 					brightness);
 	}
 }
@@ -206,11 +206,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(led_cdev, LED_OFF);
+			led_set_brightness_sync(led_cdev, LED_OFF);
 			return led_set_flash_strobe(fled_cdev, false);
 		case V4L2_FLASH_LED_MODE_FLASH:
 			/* Turn the torch LED off */
-			led_set_brightness(led_cdev, LED_OFF);
+			led_set_brightness_sync(led_cdev, LED_OFF);
 			if (ctrls[STROBE_SOURCE]) {
 				external_strobe = (ctrls[STROBE_SOURCE]->val ==
 					V4L2_FLASH_STROBE_SOURCE_EXTERNAL);
-- 
1.7.9.5

Re: [PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[Pavel Machek]

On Wed 2015-10-07 11:10:48, Jacek Anaszewski wrote:
> LED subsystem shifted responsibility for choosing between SYNC or ASYNC
> way of setting brightness from drivers to the caller. Adapt the wrapper
> to those changes.
> 
> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
> Cc: Sakari Ailus <sakari.ailus@linux.intel.com>

7-10 of the series:

Acked-by: Pavel Machek <pavel@ucw.cz>

Re: [PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[Jacek Anaszewski]

Hi Mauro,

This patch depends on the preceding LED core improvements patches
from this patch set, and it would be best if it was merged through
the LED tree. Can I get your ack for this? I've already obtained acks
for the whole set from Sakari.

Best Regards,
Jacek Anaszewski

On 10/07/2015 11:10 AM, Jacek Anaszewski wrote:
> LED subsystem shifted responsibility for choosing between SYNC or ASYNC
> way of setting brightness from drivers to the caller. Adapt the wrapper
> to those changes.
>
> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
> Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: linux-media@vger.kernel.org
> ---
>   drivers/media/v4l2-core/v4l2-flash-led-class.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> index 5bdfb8d..5d67335 100644
> --- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
> +++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
> @@ -107,10 +107,10 @@ static void v4l2_flash_set_led_brightness(struct v4l2_flash *v4l2_flash,
>   		if (ctrls[LED_MODE]->val != V4L2_FLASH_LED_MODE_TORCH)
>   			return;
>
> -		led_set_brightness(&v4l2_flash->fled_cdev->led_cdev,
> +		led_set_brightness_sync(&v4l2_flash->fled_cdev->led_cdev,
>   					brightness);
>   	} else {
> -		led_set_brightness(&v4l2_flash->iled_cdev->led_cdev,
> +		led_set_brightness_sync(&v4l2_flash->iled_cdev->led_cdev,
>   					brightness);
>   	}
>   }
> @@ -206,11 +206,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(led_cdev, LED_OFF);
> +			led_set_brightness_sync(led_cdev, LED_OFF);
>   			return led_set_flash_strobe(fled_cdev, false);
>   		case V4L2_FLASH_LED_MODE_FLASH:
>   			/* Turn the torch LED off */
> -			led_set_brightness(led_cdev, LED_OFF);
> +			led_set_brightness_sync(led_cdev, LED_OFF);
>   			if (ctrls[STROBE_SOURCE]) {
>   				external_strobe = (ctrls[STROBE_SOURCE]->val ==
>   					V4L2_FLASH_STROBE_SOURCE_EXTERNAL);
>

Re: [PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[Sakari Ailus]

Jacek Anaszewski wrote:
> This patch depends on the preceding LED core improvements patches
> from this patch set, and it would be best if it was merged through
> the LED tree. Can I get your ack for this? I've already obtained acks
> for the whole set from Sakari.

I agree with this going through the LED tree.

-- 
Sakari Ailus
sakari.ailus@linux.intel.com

Re: [PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[Jacek Anaszewski]

On 11/16/2015 10:47 AM, Sakari Ailus wrote:
> Jacek Anaszewski wrote:
>> This patch depends on the preceding LED core improvements patches
>> from this patch set, and it would be best if it was merged through
>> the LED tree. Can I get your ack for this? I've already obtained acks
>> for the whole set from Sakari.
>
> I agree with this going through the LED tree.
>

Applied this patch set, with fixed version of the patch 4/10 [1],
thanks.

[1] http://www.spinics.net/lists/linux-leds/msg05045.html
-- 
Best Regards,
Jacek Anaszewski

Re: [PATCH v3 10/10] media: flash: use led_set_brightness_sync for torch brightness

[Mauro Carvalho Chehab]

Em Mon, 16 Nov 2015 11:47:58 +0200
Sakari Ailus <sakari.ailus@linux.intel.com> escreveu:

> Jacek Anaszewski wrote:
> > This patch depends on the preceding LED core improvements patches
> > from this patch set, and it would be best if it was merged through
> > the LED tree. Can I get your ack for this? I've already obtained acks
> > for the whole set from Sakari.
> 
> I agree with this going through the LED tree.

Feel free to send it via the LED tree.

Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Regards,
Mauro