From: Jacek Anaszewski <j.anaszewski@samsung.com>
To: linux-leds@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, cooloney@gmail.com,
rpurdie@rpsys.net, stsp@users.sourceforge.net, pavel@ucw.cz,
sakari.ailus@linux.intel.com, andreas.werner@men.de,
andrew@lunn.ch, ospite@studenti.unina.it, anemo@mba.ocn.ne.jp,
ben@simtec.co.uk, bootc@bootc.net, dmurphy@ti.com,
daniel.jeong@ti.com, daniel@zonque.org, davem@davemloft.net,
fabio.baltieri@gmail.com, balbi@ti.com, florian@openwrt.org,
gshark.jeong@gmail.com, g.liakhovetski@gmx.de,
ingi2.kim@samsung.com, dl9pf@gmx.de, johan@kernel.org,
lenz@cs.wisc.edu, jogo@openwrt.org, q1.kim@samsung.com,
kris@krisk.org, kristoffer.ericson@gmail.com,
linus.walleij@linaro.org, broonie@kernel.org,
michael.hennerich@analog.com, milo.kim@ti.com, nm127@freemail.hu,
ncase@xes-inc.com, neilb@suse.de, nick.forbes@incepta.com,
lost.distance@yahoo.com, p.meerwald@bct-electronic.com,
n0-1@freewrt.org, philippe.retornaz@epfl.ch, raph@8d.com,
rpurdie@openedhand.com, rod@whitby.id.au, dave@sr71.net,
giometti@linux.it, bigeasy@linutronix.de, shuahkhan@gmail.com,
sguinot@lacie.com, kyungmin.park@samsung.com,
Jacek Anaszewski <j.anaszewski@samsung.com>
Subject: [PATCH/RFC v3 6/7] media: flash: use led_set_brightness_sync for torch brightness
Date: Fri, 03 Jul 2015 15:10:51 +0200 [thread overview]
Message-ID: <1435929052-8736-7-git-send-email-j.anaszewski@samsung.com> (raw)
In-Reply-To: <1435929052-8736-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>
---
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 4e19dac..b3b082e 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-07-03 13:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-03 13:10 [PATCH/RFC v3 0/7] Remove work queues from LED class drivers Jacek Anaszewski
2015-07-03 13:10 ` [PATCH/RFC v3 1/7] leds: Add led_set_brightness_sync to the public LED subsystem API Jacek Anaszewski
2015-07-05 12:34 ` Pavel Machek
2015-07-06 6:31 ` Jacek Anaszewski
2015-07-03 13:10 ` [PATCH/RFC v3 2/7] leds: Improve asynchronous path of setting brightness Jacek Anaszewski
2015-07-03 13:10 ` [PATCH/RFC v3 3/7] leds: Add an internal led_set_brightness_nosleep function Jacek Anaszewski
2015-07-03 13:10 ` [PATCH/RFC v3 4/7] leds: Improve setting brightness in a non sleeping way Jacek Anaszewski
2015-07-03 13:10 ` [PATCH/RFC v3 5/7] leds: Drivers shouldn't enforce SYNC/ASYNC brightness setting Jacek Anaszewski
2015-07-03 13:10 ` Jacek Anaszewski [this message]
2015-07-03 13:10 ` [PATCH/RFC v3 7/7] leds: pwm: remove work queue Jacek Anaszewski
2015-07-05 12:33 ` Pavel Machek
2015-07-14 14:10 ` [PATCH/RFC v3 0/7] Remove work queues from LED class drivers Simon Guinot
2015-07-14 14:23 ` 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=1435929052-8736-7-git-send-email-j.anaszewski@samsung.com \
--to=j.anaszewski@samsung.com \
--cc=andreas.werner@men.de \
--cc=andrew@lunn.ch \
--cc=anemo@mba.ocn.ne.jp \
--cc=balbi@ti.com \
--cc=ben@simtec.co.uk \
--cc=bigeasy@linutronix.de \
--cc=bootc@bootc.net \
--cc=broonie@kernel.org \
--cc=cooloney@gmail.com \
--cc=daniel.jeong@ti.com \
--cc=daniel@zonque.org \
--cc=dave@sr71.net \
--cc=davem@davemloft.net \
--cc=dl9pf@gmx.de \
--cc=dmurphy@ti.com \
--cc=fabio.baltieri@gmail.com \
--cc=florian@openwrt.org \
--cc=g.liakhovetski@gmx.de \
--cc=giometti@linux.it \
--cc=gshark.jeong@gmail.com \
--cc=ingi2.kim@samsung.com \
--cc=jogo@openwrt.org \
--cc=johan@kernel.org \
--cc=kris@krisk.org \
--cc=kristoffer.ericson@gmail.com \
--cc=kyungmin.park@samsung.com \
--cc=lenz@cs.wisc.edu \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=lost.distance@yahoo.com \
--cc=michael.hennerich@analog.com \
--cc=milo.kim@ti.com \
--cc=n0-1@freewrt.org \
--cc=ncase@xes-inc.com \
--cc=neilb@suse.de \
--cc=nick.forbes@incepta.com \
--cc=nm127@freemail.hu \
--cc=ospite@studenti.unina.it \
--cc=p.meerwald@bct-electronic.com \
--cc=pavel@ucw.cz \
--cc=philippe.retornaz@epfl.ch \
--cc=q1.kim@samsung.com \
--cc=raph@8d.com \
--cc=rod@whitby.id.au \
--cc=rpurdie@openedhand.com \
--cc=rpurdie@rpsys.net \
--cc=sakari.ailus@linux.intel.com \
--cc=sguinot@lacie.com \
--cc=shuahkhan@gmail.com \
--cc=stsp@users.sourceforge.net \
/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®