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

Commit 13a54247 authored by Christoph Egger's avatar Christoph Egger Committed by Eric Miao
Browse files

[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: default avatarChristoph Egger <siccegge@cs.fau.de>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 7509acdf

arch/arm/mach-pxa/corgi_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { 
	.should_wakeup   = corgi_should_wakeup,

#if defined(CONFIG_LCD_CORGI)

	.backlight_limit = corgi_lcd_limit_intensity,

#elif defined(CONFIG_BACKLIGHT_CORGI)

	.backlight_limit = corgibl_limit_intensity,

#endif

	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,

	.charge_on_temp	  = SHARPSL_CHARGE_ON_TEMP,

arch/arm/mach-pxa/sharpsl_pm.c

+0 −15
Original line number Diff line number Diff line
@@ -277,21 +277,6 @@ static void sharpsl_battery_thread(struct work_struct *private_) 
	dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,

			sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);



#ifdef CONFIG_BACKLIGHT_CORGI

	/* If battery is low. limit backlight intensity to save power. */

	if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)

	    && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)

	    || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {

		if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {

			sharpsl_pm.machinfo->backlight_limit(1);

			sharpsl_pm.flags |= SHARPSL_BL_LIMIT;

		}

	} else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) {

		sharpsl_pm.machinfo->backlight_limit(0);

		sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;

	}

#endif



	/* Suspend if critical battery level */

	if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)

	     && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)

arch/arm/mach-pxa/spitz_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -212,8 +212,6 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { 
	.should_wakeup    = spitz_should_wakeup,

#if defined(CONFIG_LCD_CORGI)

	.backlight_limit = corgi_lcd_limit_intensity,

#elif defined(CONFIG_BACKLIGHT_CORGI)

	.backlight_limit  = corgibl_limit_intensity,

#endif

	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,

	.charge_on_temp	  = SHARPSL_CHARGE_ON_TEMP,