diff options
author | Shuah Khan <shuahkhan@gmail.com> | 2012-06-12 22:01:37 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@canonical.com> | 2012-07-23 19:52:34 -0400 |
commit | 0da3e65ba892b8c63d55fa5ec197b6fae55f75f8 (patch) | |
tree | 2df9324b199abaa542854297611e0c815517f51f /drivers/leds/ledtrig-transient.c | |
parent | 5e417281cde2ef56e9eb1a95d080d6254402e794 (diff) |
leds: Rename led_set_brightness() to __led_set_brightness()
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>
Diffstat (limited to 'drivers/leds/ledtrig-transient.c')
-rw-r--r-- | drivers/leds/ledtrig-transient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/leds/ledtrig-transient.c b/drivers/leds/ledtrig-transient.c index 83179f435e1e..398f1042c43e 100644 --- a/drivers/leds/ledtrig-transient.c +++ b/drivers/leds/ledtrig-transient.c | |||
@@ -41,7 +41,7 @@ static void transient_timer_function(unsigned long data) | |||
41 | struct transient_trig_data *transient_data = led_cdev->trigger_data; | 41 | struct transient_trig_data *transient_data = led_cdev->trigger_data; |
42 | 42 | ||
43 | transient_data->activate = 0; | 43 | transient_data->activate = 0; |
44 | led_set_brightness(led_cdev, transient_data->restore_state); | 44 | __led_set_brightness(led_cdev, transient_data->restore_state); |
45 | } | 45 | } |
46 | 46 | ||
47 | static ssize_t transient_activate_show(struct device *dev, | 47 | static ssize_t transient_activate_show(struct device *dev, |
@@ -72,7 +72,7 @@ static ssize_t transient_activate_store(struct device *dev, | |||
72 | if (state == 0 && transient_data->activate == 1) { | 72 | if (state == 0 && transient_data->activate == 1) { |
73 | del_timer(&transient_data->timer); | 73 | del_timer(&transient_data->timer); |
74 | transient_data->activate = state; | 74 | transient_data->activate = state; |
75 | led_set_brightness(led_cdev, transient_data->restore_state); | 75 | __led_set_brightness(led_cdev, transient_data->restore_state); |
76 | return size; | 76 | return size; |
77 | } | 77 | } |
78 | 78 | ||
@@ -80,7 +80,7 @@ static ssize_t transient_activate_store(struct device *dev, | |||
80 | if (state == 1 && transient_data->activate == 0 && | 80 | if (state == 1 && transient_data->activate == 0 && |
81 | transient_data->duration != 0) { | 81 | transient_data->duration != 0) { |
82 | transient_data->activate = state; | 82 | transient_data->activate = state; |
83 | led_set_brightness(led_cdev, transient_data->state); | 83 | __led_set_brightness(led_cdev, transient_data->state); |
84 | transient_data->restore_state = | 84 | transient_data->restore_state = |
85 | (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; | 85 | (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; |
86 | mod_timer(&transient_data->timer, | 86 | mod_timer(&transient_data->timer, |
@@ -203,7 +203,7 @@ static void transient_trig_deactivate(struct led_classdev *led_cdev) | |||
203 | 203 | ||
204 | if (led_cdev->activated) { | 204 | if (led_cdev->activated) { |
205 | del_timer_sync(&transient_data->timer); | 205 | del_timer_sync(&transient_data->timer); |
206 | led_set_brightness(led_cdev, transient_data->restore_state); | 206 | __led_set_brightness(led_cdev, transient_data->restore_state); |
207 | device_remove_file(led_cdev->dev, &dev_attr_activate); | 207 | device_remove_file(led_cdev->dev, &dev_attr_activate); |
208 | device_remove_file(led_cdev->dev, &dev_attr_duration); | 208 | device_remove_file(led_cdev->dev, &dev_attr_duration); |
209 | device_remove_file(led_cdev->dev, &dev_attr_state); | 209 | device_remove_file(led_cdev->dev, &dev_attr_state); |