Re: [PATCH 23/33] Removing dead BACKLIGHT_CORGI

[Eric Miao]

On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@xxxxxxxxx> wrote:
> BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@xxxxxxxxx>

BACKLIGHT_CORGI was renamed to BACKLIGHT_GENERIC in commit
d00ba726725c6f41e43df00f83e484ba8f9fac5c.

Since it's now safe to completely transition to LCD_CORGI, which not only
includes the backlight functionality but also the LCD, so

Acked-by: Eric Miao <eric.y.miao@xxxxxxxxx>

> ---
> Âarch/arm/mach-pxa/corgi_pm.c  |  Â2 --
> Âarch/arm/mach-pxa/sharpsl_pm.c | Â 15 ---------------
> Â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 3f1dc74..a735205 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 = {
>    Â.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,
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index cb47672..582701e 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_)
> Â Â Â Â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)
> diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
> index 4209ddf..b36f0ae 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 = {
>    Â.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,
> --
> 1.7.0.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/