From: David Brownell <dbrownell@users.sourceforge.net>
Date: Thu, 27 Mar 2008 00:59:02 +0000 (+0000)
Subject: leds: Remove incorrect use of preempt_count() from leds-gpio
X-Git-Tag: v2.6.25-rc8~8^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=306dd85c1d41e20a07d1e821e27f5df4927bb5e7;p=linux-2.6

leds: Remove incorrect use of preempt_count() from leds-gpio

It appears that we can't just check to see if we're in a task
context ... so instead of trying that, just make the relevant
leds always schedule a little worklet.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
---

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index d13b622419..4c0b05852c 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -49,13 +49,13 @@ static void gpio_led_set(struct led_classdev *led_cdev,
 	if (led_dat->active_low)
 		level = !level;
 
-	/* setting GPIOs with I2C/etc requires a preemptible task context */
+	/* Setting GPIOs with I2C/etc requires a task context, and we don't
+	 * seem to have a reliable way to know if we're already in one; so
+	 * let's just assume the worst.
+	 */
 	if (led_dat->can_sleep) {
-		if (preempt_count()) {
-			led_dat->new_level = level;
-			schedule_work(&led_dat->work);
-		} else
-			gpio_set_value_cansleep(led_dat->gpio, level);
+		led_dat->new_level = level;
+		schedule_work(&led_dat->work);
 	} else
 		gpio_set_value(led_dat->gpio, level);
 }