Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0da3e65b authored by Shuah Khan's avatar Shuah Khan Committed by Bryan Wu
Browse files

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: default avatarShuah Khan <shuahkhan@gmail.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent 5e417281

drivers/leds/led-class.c

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static ssize_t led_brightness_store(struct device *dev, 


	if (state == LED_OFF)

		led_trigger_remove(led_cdev);

	led_set_brightness(led_cdev, state);

	__led_set_brightness(led_cdev, state);



	return size;

}
@@ -82,7 +82,7 @@ static void led_timer_function(unsigned long data) 
	unsigned long delay;



	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;

	}
@@ -105,7 +105,7 @@ static void led_timer_function(unsigned long data) 
		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

	 * the final blink state so that the led is toggled each delay_on +

drivers/leds/led-core.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev, 


	/* never off - just set to brightness */

	if (!delay_off) {

		led_set_brightness(led_cdev, led_cdev->blink_brightness);

		__led_set_brightness(led_cdev, led_cdev->blink_brightness);

		return;

	}
@@ -111,6 +111,6 @@ void led_brightness_set(struct led_classdev *led_cdev, 
	led_cdev->blink_delay_on = 0;

	led_cdev->blink_delay_off = 0;



	led_set_brightness(led_cdev, brightness);

	__led_set_brightness(led_cdev, brightness);

}

EXPORT_SYMBOL(led_brightness_set);

drivers/leds/led-triggers.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void led_trigger_event(struct led_trigger *trig, 
		struct led_classdev *led_cdev;



		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);

}

drivers/leds/leds.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/rwsem.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)

{

	if (value > led_cdev->max_brightness)

drivers/leds/ledtrig-backlight.c

+4 −4
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ static int fb_notifier_callback(struct notifier_block *p, 


		if ((n->old_status == UNBLANK) ^ n->invert) {

			n->brightness = led->brightness;

			led_set_brightness(led, LED_OFF);

			__led_set_brightness(led, LED_OFF);

		} else {

			led_set_brightness(led, n->brightness);

			__led_set_brightness(led, n->brightness);

		}



		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. */

	if ((n->old_status == BLANK) ^ n->invert)

		led_set_brightness(led, LED_OFF);

		__led_set_brightness(led, LED_OFF);

	else

		led_set_brightness(led, n->brightness);

		__led_set_brightness(led, n->brightness);



	return num;

}