diff options
author | Christoph Egger <siccegge@cs.fau.de> | 2010-07-04 11:24:52 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 02:32:30 -0400 |
commit | 13a542475d1c62a12c77abfa83a790245598fc61 (patch) | |
tree | 9bb2f8f38e5a16dcaa94c8d26a6948766a1dbe2e /arch/arm/mach-pxa | |
parent | 7509acdfd128943d0eced51a4b19b8a3cb1b5d26 (diff) |
[ARM] pxa: removing dead BACKLIGHT_CORGI
BACKLIGHT_CORGI was later renamed to BACKLIGHT_GENERIC and has not been
used since then. As it's now safe to completely transition to LCD_CORGI
driver, which incorprates both the LCD and backlight device.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 2 |
3 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 3f1dc74ac048..a7352056389f 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
@@ -165,8 +165,6 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { | |||
165 | .should_wakeup = corgi_should_wakeup, | 165 | .should_wakeup = corgi_should_wakeup, |
166 | #if defined(CONFIG_LCD_CORGI) | 166 | #if defined(CONFIG_LCD_CORGI) |
167 | .backlight_limit = corgi_lcd_limit_intensity, | 167 | .backlight_limit = corgi_lcd_limit_intensity, |
168 | #elif defined(CONFIG_BACKLIGHT_CORGI) | ||
169 | .backlight_limit = corgibl_limit_intensity, | ||
170 | #endif | 168 | #endif |
171 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 169 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
172 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 170 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index cb4767251f3c..582701e5337f 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -277,21 +277,6 @@ static void sharpsl_battery_thread(struct work_struct *private_) | |||
277 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, | 277 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, |
278 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); | 278 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); |
279 | 279 | ||
280 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
281 | /* If battery is low. limit backlight intensity to save power. */ | ||
282 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) | ||
283 | && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) | ||
284 | || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) { | ||
285 | if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) { | ||
286 | sharpsl_pm.machinfo->backlight_limit(1); | ||
287 | sharpsl_pm.flags |= SHARPSL_BL_LIMIT; | ||
288 | } | ||
289 | } else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) { | ||
290 | sharpsl_pm.machinfo->backlight_limit(0); | ||
291 | sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT; | ||
292 | } | ||
293 | #endif | ||
294 | |||
295 | /* Suspend if critical battery level */ | 280 | /* Suspend if critical battery level */ |
296 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) | 281 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) |
297 | && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL) | 282 | && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL) |
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 4209ddf6da61..b36f0ae9dae1 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
@@ -212,8 +212,6 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { | |||
212 | .should_wakeup = spitz_should_wakeup, | 212 | .should_wakeup = spitz_should_wakeup, |
213 | #if defined(CONFIG_LCD_CORGI) | 213 | #if defined(CONFIG_LCD_CORGI) |
214 | .backlight_limit = corgi_lcd_limit_intensity, | 214 | .backlight_limit = corgi_lcd_limit_intensity, |
215 | #elif defined(CONFIG_BACKLIGHT_CORGI) | ||
216 | .backlight_limit = corgibl_limit_intensity, | ||
217 | #endif | 215 | #endif |
218 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 216 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
219 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 217 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |