diff options
author | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-09-22 11:21:04 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2014-11-14 17:29:35 -0500 |
commit | acd899e4f3066b6662f6047da5b795cc762093cb (patch) | |
tree | 8a0cdf6849c1aec46d741ddee463067951a942ed /drivers/leds/led-class.c | |
parent | 3f6e42c808409c40dd0d0f8fe2022d197b27455e (diff) |
leds: implement sysfs interface locking mechanism
Add a mechanism for locking LED subsystem sysfs interface.
This patch prepares ground for addition of LED Flash Class
extension, whose API will be integrated with V4L2 Flash API.
Such a fusion enforces introducing a locking scheme, which
will secure consistent access to the LED Flash Class device.
The mechanism being introduced allows for disabling LED
subsystem sysfs interface by calling led_sysfs_disable function
and enabling it by calling led_sysfs_enable. The functions
alter the LED_SYSFS_DISABLE flag state and must be called
under mutex lock. The state of the lock is checked with use
of led_sysfs_is_disabled function. Such a design allows for
providing immediate feedback to the user space on whether
the LED Flash Class device is available or is under V4L2 Flash
sub-device control.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/led-class.c')
-rw-r--r-- | drivers/leds/led-class.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 7440c58b8e6f..65722deb8d28 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c | |||
@@ -40,17 +40,27 @@ static ssize_t brightness_store(struct device *dev, | |||
40 | { | 40 | { |
41 | struct led_classdev *led_cdev = dev_get_drvdata(dev); | 41 | struct led_classdev *led_cdev = dev_get_drvdata(dev); |
42 | unsigned long state; | 42 | unsigned long state; |
43 | ssize_t ret = -EINVAL; | 43 | ssize_t ret; |
44 | |||
45 | mutex_lock(&led_cdev->led_access); | ||
46 | |||
47 | if (led_sysfs_is_disabled(led_cdev)) { | ||
48 | ret = -EBUSY; | ||
49 | goto unlock; | ||
50 | } | ||
44 | 51 | ||
45 | ret = kstrtoul(buf, 10, &state); | 52 | ret = kstrtoul(buf, 10, &state); |
46 | if (ret) | 53 | if (ret) |
47 | return ret; | 54 | goto unlock; |
48 | 55 | ||
49 | if (state == LED_OFF) | 56 | if (state == LED_OFF) |
50 | led_trigger_remove(led_cdev); | 57 | led_trigger_remove(led_cdev); |
51 | __led_set_brightness(led_cdev, state); | 58 | __led_set_brightness(led_cdev, state); |
52 | 59 | ||
53 | return size; | 60 | ret = size; |
61 | unlock: | ||
62 | mutex_unlock(&led_cdev->led_access); | ||
63 | return ret; | ||
54 | } | 64 | } |
55 | static DEVICE_ATTR_RW(brightness); | 65 | static DEVICE_ATTR_RW(brightness); |
56 | 66 | ||
@@ -214,6 +224,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) | |||
214 | #ifdef CONFIG_LEDS_TRIGGERS | 224 | #ifdef CONFIG_LEDS_TRIGGERS |
215 | init_rwsem(&led_cdev->trigger_lock); | 225 | init_rwsem(&led_cdev->trigger_lock); |
216 | #endif | 226 | #endif |
227 | mutex_init(&led_cdev->led_access); | ||
217 | /* add to the list of leds */ | 228 | /* add to the list of leds */ |
218 | down_write(&leds_list_lock); | 229 | down_write(&leds_list_lock); |
219 | list_add_tail(&led_cdev->node, &leds_list); | 230 | list_add_tail(&led_cdev->node, &leds_list); |
@@ -267,6 +278,8 @@ void led_classdev_unregister(struct led_classdev *led_cdev) | |||
267 | down_write(&leds_list_lock); | 278 | down_write(&leds_list_lock); |
268 | list_del(&led_cdev->node); | 279 | list_del(&led_cdev->node); |
269 | up_write(&leds_list_lock); | 280 | up_write(&leds_list_lock); |
281 | |||
282 | mutex_destroy(&led_cdev->led_access); | ||
270 | } | 283 | } |
271 | EXPORT_SYMBOL_GPL(led_classdev_unregister); | 284 | EXPORT_SYMBOL_GPL(led_classdev_unregister); |
272 | 285 | ||