mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 18:07:03 +00:00
3fbd8716da
Function led_set_software_blink() assumes that blink timer is still running,
but commit 488bc35bf4 introduced disabling
of blink timer before each call to led_set_software_blink().
Correct led_software_blink():
1) remove protection against reprogramming blink timer to the same values,
because it only disables blinking now,
2) remove unnecessary call to led_stop_software_blink().
Signed-off-by: Rafal Prylowski <prylowski@metasoft.pl>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
89 lines
2.1 KiB
C
89 lines
2.1 KiB
C
/*
|
|
* LED Class Core
|
|
*
|
|
* Copyright 2005-2006 Openedhand Ltd.
|
|
*
|
|
* Author: Richard Purdie <rpurdie@openedhand.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/list.h>
|
|
#include <linux/module.h>
|
|
#include <linux/rwsem.h>
|
|
#include <linux/leds.h>
|
|
#include "leds.h"
|
|
|
|
DECLARE_RWSEM(leds_list_lock);
|
|
EXPORT_SYMBOL_GPL(leds_list_lock);
|
|
|
|
LIST_HEAD(leds_list);
|
|
EXPORT_SYMBOL_GPL(leds_list);
|
|
|
|
static void led_stop_software_blink(struct led_classdev *led_cdev)
|
|
{
|
|
/* deactivate previous settings */
|
|
del_timer_sync(&led_cdev->blink_timer);
|
|
led_cdev->blink_delay_on = 0;
|
|
led_cdev->blink_delay_off = 0;
|
|
}
|
|
|
|
static void led_set_software_blink(struct led_classdev *led_cdev,
|
|
unsigned long delay_on,
|
|
unsigned long delay_off)
|
|
{
|
|
int current_brightness;
|
|
|
|
current_brightness = led_get_brightness(led_cdev);
|
|
if (current_brightness)
|
|
led_cdev->blink_brightness = current_brightness;
|
|
if (!led_cdev->blink_brightness)
|
|
led_cdev->blink_brightness = led_cdev->max_brightness;
|
|
|
|
led_cdev->blink_delay_on = delay_on;
|
|
led_cdev->blink_delay_off = delay_off;
|
|
|
|
/* never on - don't blink */
|
|
if (!delay_on)
|
|
return;
|
|
|
|
/* never off - just set to brightness */
|
|
if (!delay_off) {
|
|
led_set_brightness(led_cdev, led_cdev->blink_brightness);
|
|
return;
|
|
}
|
|
|
|
mod_timer(&led_cdev->blink_timer, jiffies + 1);
|
|
}
|
|
|
|
|
|
void led_blink_set(struct led_classdev *led_cdev,
|
|
unsigned long *delay_on,
|
|
unsigned long *delay_off)
|
|
{
|
|
del_timer_sync(&led_cdev->blink_timer);
|
|
|
|
if (led_cdev->blink_set &&
|
|
!led_cdev->blink_set(led_cdev, delay_on, delay_off))
|
|
return;
|
|
|
|
/* blink with 1 Hz as default if nothing specified */
|
|
if (!*delay_on && !*delay_off)
|
|
*delay_on = *delay_off = 500;
|
|
|
|
led_set_software_blink(led_cdev, *delay_on, *delay_off);
|
|
}
|
|
EXPORT_SYMBOL(led_blink_set);
|
|
|
|
void led_brightness_set(struct led_classdev *led_cdev,
|
|
enum led_brightness brightness)
|
|
{
|
|
led_stop_software_blink(led_cdev);
|
|
led_cdev->brightness_set(led_cdev, brightness);
|
|
}
|
|
EXPORT_SYMBOL(led_brightness_set);
|