From 583d8a2c82a0fc97b1c5323dc825050f5f268a50 Mon Sep 17 00:00:00 2001 From: Markinus Date: Sat, 16 Oct 2010 13:35:48 +0200 Subject: [PATCH] htcleo: store brightness in the led driver --- arch/arm/mach-msm/board-htcleo-bl-led.c | 5 ++--- arch/arm/mach-msm/board-htcleo-keypad.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-msm/board-htcleo-bl-led.c b/arch/arm/mach-msm/board-htcleo-bl-led.c index 6e098488..3a492260 100644 --- a/arch/arm/mach-msm/board-htcleo-bl-led.c +++ b/arch/arm/mach-msm/board-htcleo-bl-led.c @@ -38,7 +38,6 @@ #endif #define HTCLEO_DEFAULT_BACKLIGHT_BRIGHTNESS 255 -static int htcleo_backlight_brightness = HTCLEO_DEFAULT_BACKLIGHT_BRIGHTNESS; static struct led_trigger *htcleo_lcd_backlight; static int auto_bl_state=0; @@ -127,11 +126,11 @@ static int htcleo_brightness_set_bkl(uint8_t value) static void htcleo_brightness_set(struct led_classdev *led_cdev, enum led_brightness val) { mutex_lock(&htcleo_backlight_lock); - htcleo_backlight_brightness = val; // set brigtness level via MicroP LCMDBG("htcleo_brightness_set: %d\n", val); if (val > 255) val = 255; + led_cdev->brightness = val; if (val < 30) { htcleo_brightness_onoff_bkl(0); @@ -146,7 +145,7 @@ static void htcleo_brightness_set(struct led_classdev *led_cdev, enum led_bright static enum led_brightness htcleo_brightness_get(struct led_classdev *led_cdev) { - return htcleo_backlight_brightness; + return led_cdev->brightness; } static struct led_classdev htcleo_backlight_led = diff --git a/arch/arm/mach-msm/board-htcleo-keypad.c b/arch/arm/mach-msm/board-htcleo-keypad.c index 4ba9b443..3117a245 100644 --- a/arch/arm/mach-msm/board-htcleo-keypad.c +++ b/arch/arm/mach-msm/board-htcleo-keypad.c @@ -27,7 +27,6 @@ #include "board-htcleo.h" #define HTCLEO_DEFAULT_KEYPAD_BRIGHTNESS 0 -static int htcleo_keypad_brightness = HTCLEO_DEFAULT_KEYPAD_BRIGHTNESS; static DEFINE_MUTEX(htcleo_keypad_brightness_lock); struct led_data { @@ -179,7 +178,7 @@ static void keypad_led_brightness_set(struct led_classdev *led_cdev, if (brightness > 255) brightness = 255; - htcleo_keypad_brightness = brightness; + led_cdev->brightness = brightness; spin_lock_irqsave(&keypad_led_data.brightness_lock, flags); keypad_led_data.brightness = brightness; @@ -191,7 +190,7 @@ static void keypad_led_brightness_set(struct led_classdev *led_cdev, static enum led_brightness keypad_led_brightness_get(struct led_classdev *led_cdev) { - return htcleo_keypad_brightness; + return led_cdev->brightness; } static struct led_classdev htcleo_backlight_led =