* [PATCH] leds: ns2: Remove work queue
@ 2015-11-20 10:44 Jacek Anaszewski
2015-11-27 11:10 ` Simon Guinot
0 siblings, 1 reply; 3+ messages in thread
From: Jacek Anaszewski @ 2015-11-20 10:44 UTC (permalink / raw)
To: linux-leds; +Cc: Jacek Anaszewski, Simon Guinot
Now the core implements the work queue, remove it from the driver,
and switch to using brightness_set_blocking op for 'cansleep' case.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: Simon Guinot <simon.guinot@sequanux.org>
---
drivers/leds/leds-ns2.c | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index a95a612..506b75b 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -45,24 +45,12 @@ struct ns2_led_data {
unsigned cmd;
unsigned slow;
bool can_sleep;
- int mode_index;
unsigned char sata; /* True when SATA mode active. */
rwlock_t rw_lock; /* Lock GPIOs. */
- struct work_struct work;
int num_modes;
struct ns2_led_modval *modval;
};
-static void ns2_led_work(struct work_struct *work)
-{
- struct ns2_led_data *led_dat =
- container_of(work, struct ns2_led_data, work);
- int i = led_dat->mode_index;
-
- gpio_set_value_cansleep(led_dat->cmd, led_dat->modval[i].cmd_level);
- gpio_set_value_cansleep(led_dat->slow, led_dat->modval[i].slow_level);
-}
-
static int ns2_led_get_mode(struct ns2_led_data *led_dat,
enum ns2_led_modes *mode)
{
@@ -112,8 +100,8 @@ static void ns2_led_set_mode(struct ns2_led_data *led_dat,
goto exit_unlock;
}
- led_dat->mode_index = i;
- schedule_work(&led_dat->work);
+ gpio_set_value_cansleep(led_dat->cmd, led_dat->modval[i].cmd_level);
+ gpio_set_value_cansleep(led_dat->slow, led_dat->modval[i].slow_level);
exit_unlock:
write_unlock_irqrestore(&led_dat->rw_lock, flags);
@@ -136,6 +124,13 @@ static void ns2_led_set(struct led_classdev *led_cdev,
ns2_led_set_mode(led_dat, mode);
}
+static int ns2_led_set_blocking(struct led_classdev *led_cdev,
+ enum led_brightness value)
+{
+ ns2_led_set(led_cdev, value);
+ return 0;
+}
+
static ssize_t ns2_led_sata_store(struct device *dev,
struct device_attribute *attr,
const char *buff, size_t count)
@@ -219,13 +214,16 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
led_dat->cdev.name = template->name;
led_dat->cdev.default_trigger = template->default_trigger;
led_dat->cdev.blink_set = NULL;
- led_dat->cdev.brightness_set = ns2_led_set;
led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
led_dat->cdev.groups = ns2_led_groups;
led_dat->cmd = template->cmd;
led_dat->slow = template->slow;
led_dat->can_sleep = gpio_cansleep(led_dat->cmd) |
gpio_cansleep(led_dat->slow);
+ if (led_dat->can_sleep)
+ led_dat->cdev.brightness_set_blocking = ns2_led_set_blocking;
+ else
+ led_dat->cdev.brightness_set = ns2_led_set;
led_dat->modval = template->modval;
led_dat->num_modes = template->num_modes;
@@ -238,8 +236,6 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
led_dat->cdev.brightness =
(mode == NS_V2_LED_OFF) ? LED_OFF : LED_FULL;
- INIT_WORK(&led_dat->work, ns2_led_work);
-
ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
if (ret < 0)
return ret;
@@ -250,7 +246,6 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
static void delete_ns2_led(struct ns2_led_data *led_dat)
{
led_classdev_unregister(&led_dat->cdev);
- cancel_work_sync(&led_dat->work);
}
#ifdef CONFIG_OF_GPIO
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] leds: ns2: Remove work queue
2015-11-20 10:44 [PATCH] leds: ns2: Remove work queue Jacek Anaszewski
@ 2015-11-27 11:10 ` Simon Guinot
2015-11-27 11:47 ` Jacek Anaszewski
0 siblings, 1 reply; 3+ messages in thread
From: Simon Guinot @ 2015-11-27 11:10 UTC (permalink / raw)
To: Jacek Anaszewski; +Cc: linux-leds
[-- Attachment #1: Type: text/plain, Size: 3792 bytes --]
Hi Jacek,
On Fri, Nov 20, 2015 at 11:44:28AM +0100, Jacek Anaszewski wrote:
> Now the core implements the work queue, remove it from the driver,
> and switch to using brightness_set_blocking op for 'cansleep' case.
>
> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
> Cc: Simon Guinot <simon.guinot@sequanux.org>
> ---
> drivers/leds/leds-ns2.c | 31 +++++++++++++------------------
> 1 file changed, 13 insertions(+), 18 deletions(-)
Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Thanks,
Simon
>
> diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
> index a95a612..506b75b 100644
> --- a/drivers/leds/leds-ns2.c
> +++ b/drivers/leds/leds-ns2.c
> @@ -45,24 +45,12 @@ struct ns2_led_data {
> unsigned cmd;
> unsigned slow;
> bool can_sleep;
> - int mode_index;
> unsigned char sata; /* True when SATA mode active. */
> rwlock_t rw_lock; /* Lock GPIOs. */
> - struct work_struct work;
> int num_modes;
> struct ns2_led_modval *modval;
> };
>
> -static void ns2_led_work(struct work_struct *work)
> -{
> - struct ns2_led_data *led_dat =
> - container_of(work, struct ns2_led_data, work);
> - int i = led_dat->mode_index;
> -
> - gpio_set_value_cansleep(led_dat->cmd, led_dat->modval[i].cmd_level);
> - gpio_set_value_cansleep(led_dat->slow, led_dat->modval[i].slow_level);
> -}
> -
> static int ns2_led_get_mode(struct ns2_led_data *led_dat,
> enum ns2_led_modes *mode)
> {
> @@ -112,8 +100,8 @@ static void ns2_led_set_mode(struct ns2_led_data *led_dat,
> goto exit_unlock;
> }
>
> - led_dat->mode_index = i;
> - schedule_work(&led_dat->work);
> + gpio_set_value_cansleep(led_dat->cmd, led_dat->modval[i].cmd_level);
> + gpio_set_value_cansleep(led_dat->slow, led_dat->modval[i].slow_level);
>
> exit_unlock:
> write_unlock_irqrestore(&led_dat->rw_lock, flags);
> @@ -136,6 +124,13 @@ static void ns2_led_set(struct led_classdev *led_cdev,
> ns2_led_set_mode(led_dat, mode);
> }
>
> +static int ns2_led_set_blocking(struct led_classdev *led_cdev,
> + enum led_brightness value)
> +{
> + ns2_led_set(led_cdev, value);
> + return 0;
> +}
> +
> static ssize_t ns2_led_sata_store(struct device *dev,
> struct device_attribute *attr,
> const char *buff, size_t count)
> @@ -219,13 +214,16 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
> led_dat->cdev.name = template->name;
> led_dat->cdev.default_trigger = template->default_trigger;
> led_dat->cdev.blink_set = NULL;
> - led_dat->cdev.brightness_set = ns2_led_set;
> led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
> led_dat->cdev.groups = ns2_led_groups;
> led_dat->cmd = template->cmd;
> led_dat->slow = template->slow;
> led_dat->can_sleep = gpio_cansleep(led_dat->cmd) |
> gpio_cansleep(led_dat->slow);
> + if (led_dat->can_sleep)
> + led_dat->cdev.brightness_set_blocking = ns2_led_set_blocking;
> + else
> + led_dat->cdev.brightness_set = ns2_led_set;
> led_dat->modval = template->modval;
> led_dat->num_modes = template->num_modes;
>
> @@ -238,8 +236,6 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
> led_dat->cdev.brightness =
> (mode == NS_V2_LED_OFF) ? LED_OFF : LED_FULL;
>
> - INIT_WORK(&led_dat->work, ns2_led_work);
> -
> ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
> if (ret < 0)
> return ret;
> @@ -250,7 +246,6 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
> static void delete_ns2_led(struct ns2_led_data *led_dat)
> {
> led_classdev_unregister(&led_dat->cdev);
> - cancel_work_sync(&led_dat->work);
> }
>
> #ifdef CONFIG_OF_GPIO
> --
> 1.7.9.5
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] leds: ns2: Remove work queue
2015-11-27 11:10 ` Simon Guinot
@ 2015-11-27 11:47 ` Jacek Anaszewski
0 siblings, 0 replies; 3+ messages in thread
From: Jacek Anaszewski @ 2015-11-27 11:47 UTC (permalink / raw)
To: Simon Guinot; +Cc: linux-leds
Hi Simon,
On 11/27/2015 12:10 PM, Simon Guinot wrote:
> Hi Jacek,
>
> On Fri, Nov 20, 2015 at 11:44:28AM +0100, Jacek Anaszewski wrote:
>> Now the core implements the work queue, remove it from the driver,
>> and switch to using brightness_set_blocking op for 'cansleep' case.
>>
>> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
>> Cc: Simon Guinot <simon.guinot@sequanux.org>
>> ---
>> drivers/leds/leds-ns2.c | 31 +++++++++++++------------------
>> 1 file changed, 13 insertions(+), 18 deletions(-)
>
> Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Thanks for the notification. Tag added.
--
Best Regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-27 11:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-20 10:44 [PATCH] leds: ns2: Remove work queue Jacek Anaszewski
2015-11-27 11:10 ` Simon Guinot
2015-11-27 11:47 ` Jacek Anaszewski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.