aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShuah Khan <shuahkhan@gmail.com>2012-06-13 16:34:30 -0400
committerBryan Wu <bryan.wu@canonical.com>2012-07-23 19:52:34 -0400
commit19cd67e2d51225b164560b54b85f943e07deee8a (patch)
treecadec9758a57fe2a805081e47f0439c870deb6d0 /drivers
parent0da3e65ba892b8c63d55fa5ec197b6fae55f75f8 (diff)
leds: Rename led_brightness_set() to led_set_brightness()
Rename leds external interface led_brightness_set() to led_set_brightness(). This is the second phase of the change to reduce confusion between the leds internal and external interfaces that set brightness. With this change, now the external interface is led_set_brightness(). The first phase renamed the internal interface led_set_brightness() to __led_set_brightness(). There are no changes to the interface implementations. Signed-off-by: Shuah Khan <shuahkhan@gmail.com> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/led-class.c2
-rw-r--r--drivers/leds/led-core.c4
-rw-r--r--drivers/leds/led-triggers.c2
-rw-r--r--drivers/leds/ledtrig-oneshot.c2
-rw-r--r--drivers/leds/ledtrig-timer.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index cb0a6eb72a2c..c599095bc005 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -222,7 +222,7 @@ void led_classdev_unregister(struct led_classdev *led_cdev)
222#endif 222#endif
223 223
224 /* Stop blinking */ 224 /* Stop blinking */
225 led_brightness_set(led_cdev, LED_OFF); 225 led_set_brightness(led_cdev, LED_OFF);
226 226
227 device_unregister(led_cdev->dev); 227 device_unregister(led_cdev->dev);
228 228
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 176961b2db6b..8a09c5fc2a6d 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -103,7 +103,7 @@ void led_blink_set_oneshot(struct led_classdev *led_cdev,
103} 103}
104EXPORT_SYMBOL(led_blink_set_oneshot); 104EXPORT_SYMBOL(led_blink_set_oneshot);
105 105
106void led_brightness_set(struct led_classdev *led_cdev, 106void led_set_brightness(struct led_classdev *led_cdev,
107 enum led_brightness brightness) 107 enum led_brightness brightness)
108{ 108{
109 /* stop and clear soft-blink timer */ 109 /* stop and clear soft-blink timer */
@@ -113,4 +113,4 @@ void led_brightness_set(struct led_classdev *led_cdev,
113 113
114 __led_set_brightness(led_cdev, brightness); 114 __led_set_brightness(led_cdev, brightness);
115} 115}
116EXPORT_SYMBOL(led_brightness_set); 116EXPORT_SYMBOL(led_set_brightness);
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index f8b14dd8c2b6..57721f25d7cd 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -112,7 +112,7 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
112 if (led_cdev->trigger->deactivate) 112 if (led_cdev->trigger->deactivate)
113 led_cdev->trigger->deactivate(led_cdev); 113 led_cdev->trigger->deactivate(led_cdev);
114 led_cdev->trigger = NULL; 114 led_cdev->trigger = NULL;
115 led_brightness_set(led_cdev, LED_OFF); 115 led_set_brightness(led_cdev, LED_OFF);
116 } 116 }
117 if (trig) { 117 if (trig) {
118 write_lock_irqsave(&trig->leddev_list_lock, flags); 118 write_lock_irqsave(&trig->leddev_list_lock, flags);
diff --git a/drivers/leds/ledtrig-oneshot.c b/drivers/leds/ledtrig-oneshot.c
index 5cbab41a8da2..2c029aa5c4f1 100644
--- a/drivers/leds/ledtrig-oneshot.c
+++ b/drivers/leds/ledtrig-oneshot.c
@@ -177,7 +177,7 @@ static void oneshot_trig_deactivate(struct led_classdev *led_cdev)
177 } 177 }
178 178
179 /* Stop blinking */ 179 /* Stop blinking */
180 led_brightness_set(led_cdev, LED_OFF); 180 led_set_brightness(led_cdev, LED_OFF);
181} 181}
182 182
183static struct led_trigger oneshot_led_trigger = { 183static struct led_trigger oneshot_led_trigger = {
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 9010f7abaf2c..f774d0592204 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -104,7 +104,7 @@ static void timer_trig_deactivate(struct led_classdev *led_cdev)
104 } 104 }
105 105
106 /* Stop blinking */ 106 /* Stop blinking */
107 led_brightness_set(led_cdev, LED_OFF); 107 led_set_brightness(led_cdev, LED_OFF);
108} 108}
109 109
110static struct led_trigger timer_led_trigger = { 110static struct led_trigger timer_led_trigger = {