From: Jacek Anaszewski <j.anaszewski@samsung.com>
To: linux-leds@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, sakari.ailus@linux.intel.com,
andrew@lunn.ch, rpurdie@rpsys.net,
Jacek Anaszewski <j.anaszewski@samsung.com>,
Pavel Machek <pavel@ucw.cz>,
linux-media@vger.kernel.org
Subject: [PATCH v2 12/12] media: flash: use led_set_brightness_sync for torch brightness
Date: Mon, 28 Sep 2015 15:07:21 +0200 [thread overview]
Message-ID: <1443445641-9529-13-git-send-email-j.anaszewski@samsung.com> (raw)
In-Reply-To: <1443445641-9529-1-git-send-email-j.anaszewski@samsung.com>
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
next prev parent reply other threads:[~2015-09-28 13:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-28 13:07 [PATCH v2 00/12] LED core improvements Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 01/12] leds: core: Use EXPORT_SYMBOL_GPL consistently Jacek Anaszewski
2015-09-28 15:13 ` Jacek Anaszewski
2015-10-08 15:51 ` Pavel Machek
2015-10-09 8:19 ` Jacek Anaszewski
2015-10-09 11:17 ` Pavel Machek
2015-09-28 13:07 ` [PATCH v2 02/12] leds: core: Move LED core callbacks out of led-class.c Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 03/12] leds: core: Add two new LED_BLINK_ flags Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 04/12] leds: Rename brightness_set_sync op to brightness_set_blocking Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 05/12] leds: core: Add an internal led_set_brightness_nosleep function Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 06/12] leds: core: Use set_brightness_work for the blocking op Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 07/12] leds: core: Drivers shouldn't enforce SYNC/ASYNC brightness setting Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 08/12] Documentation: leds: Add description of brightness setting API Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 09/12] leds: max77693: Remove work queue Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 10/12] leds: aat1290: " Jacek Anaszewski
2015-09-28 13:07 ` [PATCH v2 11/12] leds: ktd2692: " Jacek Anaszewski
2015-09-28 13:07 ` Jacek Anaszewski [this message]
2015-09-28 20:37 ` [PATCH v2 12/12] media: flash: use led_set_brightness_sync for torch brightness Pavel Machek
2015-09-29 7:26 ` Jacek Anaszewski
2015-09-29 9:39 ` Pavel Machek
2015-10-01 13:22 ` [PATCH v2 00/12] LED core improvements Sakari Ailus
2015-10-01 13:55 ` Jacek Anaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443445641-9529-13-git-send-email-j.anaszewski@samsung.com \
--to=j.anaszewski@samsung.com \
--cc=andrew@lunn.ch \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rpurdie@rpsys.net \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®