Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Shuah Khan and committed by
Bryan Wu
0da3e65b 5e417281

+22 -22
+3 -3
drivers/leds/led-class.c
··· 53 53 54 54 if (state == LED_OFF) 55 55 led_trigger_remove(led_cdev); 56 - led_set_brightness(led_cdev, state); 56 + __led_set_brightness(led_cdev, state); 57 57 58 58 return size; 59 59 } ··· 82 82 unsigned long delay; 83 83 84 84 if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) { 85 - led_set_brightness(led_cdev, LED_OFF); 85 + __led_set_brightness(led_cdev, LED_OFF); 86 86 return; 87 87 } 88 88 ··· 105 105 delay = led_cdev->blink_delay_off; 106 106 } 107 107 108 - led_set_brightness(led_cdev, brightness); 108 + __led_set_brightness(led_cdev, brightness); 109 109 110 110 /* Return in next iteration if led is in one-shot mode and we are in 111 111 * the final blink state so that the led is toggled each delay_on +
+2 -2
drivers/leds/led-core.c
··· 45 45 46 46 /* never off - just set to brightness */ 47 47 if (!delay_off) { 48 - led_set_brightness(led_cdev, led_cdev->blink_brightness); 48 + __led_set_brightness(led_cdev, led_cdev->blink_brightness); 49 49 return; 50 50 } 51 51 ··· 111 111 led_cdev->blink_delay_on = 0; 112 112 led_cdev->blink_delay_off = 0; 113 113 114 - led_set_brightness(led_cdev, brightness); 114 + __led_set_brightness(led_cdev, brightness); 115 115 } 116 116 EXPORT_SYMBOL(led_brightness_set);
+1 -1
drivers/leds/led-triggers.c
··· 224 224 struct led_classdev *led_cdev; 225 225 226 226 led_cdev = list_entry(entry, struct led_classdev, trig_list); 227 - led_set_brightness(led_cdev, brightness); 227 + __led_set_brightness(led_cdev, brightness); 228 228 } 229 229 read_unlock(&trig->leddev_list_lock); 230 230 }
+1 -1
drivers/leds/leds.h
··· 17 17 #include <linux/rwsem.h> 18 18 #include <linux/leds.h> 19 19 20 - static inline void led_set_brightness(struct led_classdev *led_cdev, 20 + static inline void __led_set_brightness(struct led_classdev *led_cdev, 21 21 enum led_brightness value) 22 22 { 23 23 if (value > led_cdev->max_brightness)
+4 -4
drivers/leds/ledtrig-backlight.c
··· 46 46 47 47 if ((n->old_status == UNBLANK) ^ n->invert) { 48 48 n->brightness = led->brightness; 49 - led_set_brightness(led, LED_OFF); 49 + __led_set_brightness(led, LED_OFF); 50 50 } else { 51 - led_set_brightness(led, n->brightness); 51 + __led_set_brightness(led, n->brightness); 52 52 } 53 53 54 54 n->old_status = new_status; ··· 87 87 88 88 /* After inverting, we need to update the LED. */ 89 89 if ((n->old_status == BLANK) ^ n->invert) 90 - led_set_brightness(led, LED_OFF); 90 + __led_set_brightness(led, LED_OFF); 91 91 else 92 - led_set_brightness(led, n->brightness); 92 + __led_set_brightness(led, n->brightness); 93 93 94 94 return num; 95 95 }
+1 -1
drivers/leds/ledtrig-default-on.c
··· 19 19 20 20 static void defon_trig_activate(struct led_classdev *led_cdev) 21 21 { 22 - led_set_brightness(led_cdev, led_cdev->max_brightness); 22 + __led_set_brightness(led_cdev, led_cdev->max_brightness); 23 23 } 24 24 25 25 static struct led_trigger defon_led_trigger = {
+3 -3
drivers/leds/ledtrig-gpio.c
··· 54 54 55 55 if (tmp) { 56 56 if (gpio_data->desired_brightness) 57 - led_set_brightness(gpio_data->led, 57 + __led_set_brightness(gpio_data->led, 58 58 gpio_data->desired_brightness); 59 59 else 60 - led_set_brightness(gpio_data->led, LED_FULL); 60 + __led_set_brightness(gpio_data->led, LED_FULL); 61 61 } else { 62 - led_set_brightness(gpio_data->led, LED_OFF); 62 + __led_set_brightness(gpio_data->led, LED_OFF); 63 63 } 64 64 } 65 65
+1 -1
drivers/leds/ledtrig-heartbeat.c
··· 74 74 break; 75 75 } 76 76 77 - led_set_brightness(led_cdev, brightness); 77 + __led_set_brightness(led_cdev, brightness); 78 78 mod_timer(&heartbeat_data->timer, jiffies + delay); 79 79 } 80 80
+2 -2
drivers/leds/ledtrig-oneshot.c
··· 63 63 oneshot_data->invert = !!state; 64 64 65 65 if (oneshot_data->invert) 66 - led_set_brightness(led_cdev, LED_FULL); 66 + __led_set_brightness(led_cdev, LED_FULL); 67 67 else 68 - led_set_brightness(led_cdev, LED_OFF); 68 + __led_set_brightness(led_cdev, LED_OFF); 69 69 70 70 return size; 71 71 }
+4 -4
drivers/leds/ledtrig-transient.c
··· 41 41 struct transient_trig_data *transient_data = led_cdev->trigger_data; 42 42 43 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 47 static ssize_t transient_activate_show(struct device *dev, ··· 72 72 if (state == 0 && transient_data->activate == 1) { 73 73 del_timer(&transient_data->timer); 74 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 76 return size; 77 77 } 78 78 ··· 80 80 if (state == 1 && transient_data->activate == 0 && 81 81 transient_data->duration != 0) { 82 82 transient_data->activate = state; 83 - led_set_brightness(led_cdev, transient_data->state); 83 + __led_set_brightness(led_cdev, transient_data->state); 84 84 transient_data->restore_state = 85 85 (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; 86 86 mod_timer(&transient_data->timer, ··· 203 203 204 204 if (led_cdev->activated) { 205 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 207 device_remove_file(led_cdev->dev, &dev_attr_activate); 208 208 device_remove_file(led_cdev->dev, &dev_attr_duration); 209 209 device_remove_file(led_cdev->dev, &dev_attr_state);