From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stone Subject: [PATCH] LED: OMAP PWM: Use work queue for brightness Date: Tue, 30 Oct 2007 11:37:32 +0200 Message-ID: <11937370523112-git-send-email-daniel.stone@nokia.com> Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-omap-open-source-bounces@linux.omap.com Errors-To: linux-omap-open-source-bounces@linux.omap.com To: linux-omap-open-source@linux.omap.com List-Id: linux-omap@vger.kernel.org It isn't safe to schedule from a LED brightness_set handler, so use a work queue. Signed-off-by: Daniel Stone --- drivers/leds/leds-omap-pwm.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/leds/leds-omap-pwm.c b/drivers/leds/leds-omap-pwm.c index 6b195d6..c5d7ff0 100644 --- a/drivers/leds/leds-omap-pwm.c +++ b/drivers/leds/leds-omap-pwm.c @@ -16,17 +16,20 @@ #include #include #include +#include #include #include #include struct omap_pwm_led { struct led_classdev cdev; + struct work_struct work; struct omap_pwm_led_platform_data *pdata; struct omap_dm_timer *intensity_timer; struct omap_dm_timer *blink_timer; int powered; unsigned int on_period, off_period; + enum led_brightness brightness; }; static inline struct omap_pwm_led *pdev_to_omap_pwm_led(struct platform_device *pdev) @@ -39,6 +42,11 @@ static inline struct omap_pwm_led *cdev_to_omap_pwm_led(struct led_classdev *led return container_of(led_cdev, struct omap_pwm_led, cdev); } +static inline struct omap_pwm_led *work_to_omap_pwm_led(struct work_struct *work) +{ + return container_of(work, struct omap_pwm_led, work); +} + static void omap_pwm_led_set_blink(struct omap_pwm_led *led) { if (!led->powered) @@ -134,9 +142,17 @@ static void omap_pwm_led_set(struct led_classdev *led_cdev, { struct omap_pwm_led *led = cdev_to_omap_pwm_led(led_cdev); - if (value != LED_OFF) { + led->brightness = value; + schedule_work(&led->work); +} + +static void omap_pwm_led_work(struct work_struct *work) +{ + struct omap_pwm_led *led = work_to_omap_pwm_led(work); + + if (led->brightness != LED_OFF) { omap_pwm_led_power_on(led); - omap_pwm_led_set_pwm_cycle(led, value); + omap_pwm_led_set_pwm_cycle(led, led->brightness); } else { omap_pwm_led_power_off(led); } @@ -228,6 +244,8 @@ static int omap_pwm_led_probe(struct platform_device *pdev) led->cdev.default_trigger = NULL; led->cdev.name = pdata->name; led->pdata = pdata; + led->brightness = 0; + INIT_WORK(&led->work, omap_pwm_led_work); dev_info(&pdev->dev, "OMAP PWM LED (%s) at GP timer %d/%d\n", pdata->name, pdata->intensity_timer, pdata->blink_timer); -- 1.4.4.2