lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

leds: Rename led_set_brightness() to __led_set_brightness()

Browse Source 
Rename leds internal interface led_set_brightness() to __led_set_brightness()
to reduce confusion between led_set_brightness() and the external interface
led_brightness_set(). led_brightness_set() cancels the timer and then calls
led_set_brightness().

Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
This commit is contained in:
Shuah Khan
2012-06-13 10:01:37 +08:00
committed by Bryan Wu
parent 5e417281cd
commit 0da3e65ba8
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/leds/led-class.c
View File

@@ -53,7 +53,7 @@ static ssize_t led_brightness_store(struct device *dev,
if (state == LED_OFF) if (state == LED_OFF)
led_trigger_remove(led_cdev); led_trigger_remove(led_cdev);
led_set_brightness(led_cdev, state); __led_set_brightness(led_cdev, state);
return size; return size;
} }
@@ -82,7 +82,7 @@ static void led_timer_function(unsigned long data)
unsigned long delay; unsigned long delay;
if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) { if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) {
led_set_brightness(led_cdev, LED_OFF); __led_set_brightness(led_cdev, LED_OFF);
return; return;
} }
@@ -105,7 +105,7 @@ static void led_timer_function(unsigned long data)
delay = led_cdev->blink_delay_off; delay = led_cdev->blink_delay_off;
} }
led_set_brightness(led_cdev, brightness); __led_set_brightness(led_cdev, brightness);
/* Return in next iteration if led is in one-shot mode and we are in /* Return in next iteration if led is in one-shot mode and we are in
* the final blink state so that the led is toggled each delay_on + * the final blink state so that the led is toggled each delay_on +

4
drivers/leds/led-core.c
View File

@@ -45,7 +45,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
/* never off - just set to brightness */ /* never off - just set to brightness */
if (!delay_off) { if (!delay_off) {
led_set_brightness(led_cdev, led_cdev->blink_brightness); __led_set_brightness(led_cdev, led_cdev->blink_brightness);
return; return;
} }
@@ -111,6 +111,6 @@ void led_brightness_set(struct led_classdev *led_cdev,
led_cdev->blink_delay_on = 0; led_cdev->blink_delay_on = 0;
led_cdev->blink_delay_off = 0; led_cdev->blink_delay_off = 0;
led_set_brightness(led_cdev, brightness); __led_set_brightness(led_cdev, brightness);
} }
EXPORT_SYMBOL(led_brightness_set); EXPORT_SYMBOL(led_brightness_set);

2
drivers/leds/led-triggers.c
View File

@@ -224,7 +224,7 @@ void led_trigger_event(struct led_trigger *trig,
struct led_classdev *led_cdev; struct led_classdev *led_cdev;
led_cdev = list_entry(entry, struct led_classdev, trig_list); led_cdev = list_entry(entry, struct led_classdev, trig_list);
led_set_brightness(led_cdev, brightness); __led_set_brightness(led_cdev, brightness);
} }
read_unlock(&trig->leddev_list_lock); read_unlock(&trig->leddev_list_lock);
} }

2
drivers/leds/leds.h
View File

@@ -17,7 +17,7 @@
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/leds.h> #include <linux/leds.h>
static inline void led_set_brightness(struct led_classdev *led_cdev, static inline void __led_set_brightness(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
if (value > led_cdev->max_brightness) if (value > led_cdev->max_brightness)

8
drivers/leds/ledtrig-backlight.c
View File

@@ -46,9 +46,9 @@ static int fb_notifier_callback(struct notifier_block *p,
if ((n->old_status == UNBLANK) ^ n->invert) { if ((n->old_status == UNBLANK) ^ n->invert) {
n->brightness = led->brightness; n->brightness = led->brightness;
led_set_brightness(led, LED_OFF); __led_set_brightness(led, LED_OFF);
} else { } else {
led_set_brightness(led, n->brightness); __led_set_brightness(led, n->brightness);
} }
n->old_status = new_status; n->old_status = new_status;
@@ -87,9 +87,9 @@ static ssize_t bl_trig_invert_store(struct device *dev,
/* After inverting, we need to update the LED. */ /* After inverting, we need to update the LED. */
if ((n->old_status == BLANK) ^ n->invert) if ((n->old_status == BLANK) ^ n->invert)
led_set_brightness(led, LED_OFF); __led_set_brightness(led, LED_OFF);
else else
led_set_brightness(led, n->brightness); __led_set_brightness(led, n->brightness);
return num; return num;
} }

2
drivers/leds/ledtrig-default-on.c
View File

@@ -19,7 +19,7 @@
static void defon_trig_activate(struct led_classdev *led_cdev) static void defon_trig_activate(struct led_classdev *led_cdev)
{ {
led_set_brightness(led_cdev, led_cdev->max_brightness); __led_set_brightness(led_cdev, led_cdev->max_brightness);
} }
static struct led_trigger defon_led_trigger = { static struct led_trigger defon_led_trigger = {

6
drivers/leds/ledtrig-gpio.c
View File

@@ -54,12 +54,12 @@ static void gpio_trig_work(struct work_struct *work)
if (tmp) { if (tmp) {
if (gpio_data->desired_brightness) if (gpio_data->desired_brightness)
led_set_brightness(gpio_data->led, __led_set_brightness(gpio_data->led,
gpio_data->desired_brightness); gpio_data->desired_brightness);
else else
led_set_brightness(gpio_data->led, LED_FULL); __led_set_brightness(gpio_data->led, LED_FULL);
} else { } else {
led_set_brightness(gpio_data->led, LED_OFF); __led_set_brightness(gpio_data->led, LED_OFF);
} }
} }

2
drivers/leds/ledtrig-heartbeat.c
View File

@@ -74,7 +74,7 @@ static void led_heartbeat_function(unsigned long data)
break; break;
} }
led_set_brightness(led_cdev, brightness); __led_set_brightness(led_cdev, brightness);
mod_timer(&heartbeat_data->timer, jiffies + delay); mod_timer(&heartbeat_data->timer, jiffies + delay);
} }

4
drivers/leds/ledtrig-oneshot.c
View File

@@ -63,9 +63,9 @@ static ssize_t led_invert_store(struct device *dev,
oneshot_data->invert = !!state; oneshot_data->invert = !!state;
if (oneshot_data->invert) if (oneshot_data->invert)
led_set_brightness(led_cdev, LED_FULL); __led_set_brightness(led_cdev, LED_FULL);
else else
led_set_brightness(led_cdev, LED_OFF); __led_set_brightness(led_cdev, LED_OFF);
return size; return size;
} }

8
drivers/leds/ledtrig-transient.c
View File

@@ -41,7 +41,7 @@ static void transient_timer_function(unsigned long data)
struct transient_trig_data *transient_data = led_cdev->trigger_data; struct transient_trig_data *transient_data = led_cdev->trigger_data;
transient_data->activate = 0; transient_data->activate = 0;
led_set_brightness(led_cdev, transient_data->restore_state); __led_set_brightness(led_cdev, transient_data->restore_state);
} }
static ssize_t transient_activate_show(struct device *dev, static ssize_t transient_activate_show(struct device *dev,
@@ -72,7 +72,7 @@ static ssize_t transient_activate_store(struct device *dev,
if (state == 0 && transient_data->activate == 1) { if (state == 0 && transient_data->activate == 1) {
del_timer(&transient_data->timer); del_timer(&transient_data->timer);
transient_data->activate = state; transient_data->activate = state;
led_set_brightness(led_cdev, transient_data->restore_state); __led_set_brightness(led_cdev, transient_data->restore_state);
return size; return size;
} }
@@ -80,7 +80,7 @@ static ssize_t transient_activate_store(struct device *dev,
if (state == 1 && transient_data->activate == 0 && if (state == 1 && transient_data->activate == 0 &&
transient_data->duration != 0) { transient_data->duration != 0) {
transient_data->activate = state; transient_data->activate = state;
led_set_brightness(led_cdev, transient_data->state); __led_set_brightness(led_cdev, transient_data->state);
transient_data->restore_state = transient_data->restore_state =
(transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL;
mod_timer(&transient_data->timer, mod_timer(&transient_data->timer,
@@ -203,7 +203,7 @@ static void transient_trig_deactivate(struct led_classdev *led_cdev)
if (led_cdev->activated) { if (led_cdev->activated) {
del_timer_sync(&transient_data->timer); del_timer_sync(&transient_data->timer);
led_set_brightness(led_cdev, transient_data->restore_state); __led_set_brightness(led_cdev, transient_data->restore_state);
device_remove_file(led_cdev->dev, &dev_attr_activate); device_remove_file(led_cdev->dev, &dev_attr_activate);
device_remove_file(led_cdev->dev, &dev_attr_duration); device_remove_file(led_cdev->dev, &dev_attr_duration);
device_remove_file(led_cdev->dev, &dev_attr_state); device_remove_file(led_cdev->dev, &dev_attr_state);