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>

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index cb0a6eb72a2c24eb080f780023956165f505e15c..c599095bc00556f9c79b3444dd2933f89ca0496a 100644 (file)
--- 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)
 #endif
 
        /* Stop blinking */
-       led_brightness_set(led_cdev, LED_OFF);
+       led_set_brightness(led_cdev, LED_OFF);
 
        device_unregister(led_cdev->dev);
 

diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 176961b2db6b3c821e59ffd7017a7c61fb14feb4..8a09c5fc2a6d920eae20cea6c6bd6fbc0c0d66fc 100644 (file)
--- 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,
 }
 EXPORT_SYMBOL(led_blink_set_oneshot);
 
-void led_brightness_set(struct led_classdev *led_cdev,
+void led_set_brightness(struct led_classdev *led_cdev,
                        enum led_brightness brightness)
 {
        /* stop and clear soft-blink timer */
@@ -113,4 +113,4 @@ void led_brightness_set(struct led_classdev *led_cdev,
 
        __led_set_brightness(led_cdev, brightness);
 }
-EXPORT_SYMBOL(led_brightness_set);
+EXPORT_SYMBOL(led_set_brightness);

diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index f8b14dd8c2b63c009a14b8c6fd538fe4c7e4bbe8..57721f25d7cd1cd784bf192d7ff37e1f66d24e79 100644 (file)
--- 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)
                if (led_cdev->trigger->deactivate)
                        led_cdev->trigger->deactivate(led_cdev);
                led_cdev->trigger = NULL;
-               led_brightness_set(led_cdev, LED_OFF);
+               led_set_brightness(led_cdev, LED_OFF);
        }
        if (trig) {
                write_lock_irqsave(&trig->leddev_list_lock, flags);

diff --git a/drivers/leds/ledtrig-oneshot.c b/drivers/leds/ledtrig-oneshot.c
index 5cbab41a8da29534dfd7d01515af72abfa360a7d..2c029aa5c4f1eea89a7ba5a733401324f783ac92 100644 (file)
--- 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)
        }
 
        /* Stop blinking */
-       led_brightness_set(led_cdev, LED_OFF);
+       led_set_brightness(led_cdev, LED_OFF);
 }
 
 static struct led_trigger oneshot_led_trigger = {

diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 9010f7abaf2cac05b5d65c118af6fcbb70a8f34e..f774d05922042a69fd470b9ede566423a736c846 100644 (file)
--- 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)
        }
 
        /* Stop blinking */
-       led_brightness_set(led_cdev, LED_OFF);
+       led_set_brightness(led_cdev, LED_OFF);
 }
 
 static struct led_trigger timer_led_trigger = {

diff --git a/include/linux/leds.h b/include/linux/leds.h
index dd93a22044bb1b80f33073c2f610dbc0db393f50..3aade1d8f410a287064167232e649be2dfb9522c 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -124,7 +124,7 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev,
                                  unsigned long *delay_off,
                                  int invert);
 /**
- * led_brightness_set - set LED brightness
+ * led_set_brightness - set LED brightness
  * @led_cdev: the LED to set
  * @brightness: the brightness to set it to
  *
@@ -132,7 +132,7 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev,
  * software blink timer that implements blinking when the
  * hardware doesn't.
  */
-extern void led_brightness_set(struct led_classdev *led_cdev,
+extern void led_set_brightness(struct led_classdev *led_cdev,
                               enum led_brightness brightness);
 
 /*

diff --git a/net/mac80211/led.c b/net/mac80211/led.c
index 1bf7903496f8f4ec67ce4e861146f329bd5ad600..bcffa69031298f97ee99f50ade02a6e862c5a8a8 100644 (file)
--- a/net/mac80211/led.c
+++ b/net/mac80211/led.c
@@ -276,7 +276,7 @@ static void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local)
 
        read_lock(&tpt_trig->trig.leddev_list_lock);
        list_for_each_entry(led_cdev, &tpt_trig->trig.led_cdevs, trig_list)
-               led_brightness_set(led_cdev, LED_OFF);
+               led_set_brightness(led_cdev, LED_OFF);
        read_unlock(&tpt_trig->trig.leddev_list_lock);
 }