2007-08-26 09:12:44

by Olaf Hering

Subject: [PATCH] atyfb: remove dead code

Remove dead code.

Signed-off-by: Olaf Hering <[email protected]>

---
drivers/video/aty/atyfb_base.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2767,8 +2767,7 @@ static int atyfb_blank(int blank, struct
if (par->lock_blank || par->asleep)
return 0;

-#ifdef CONFIG_FB_ATY_BACKLIGHT
-#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
+#ifdef CONFIG_FB_ATY_GENERIC_LCD
if (par->lcd_table && blank > FB_BLANK_NORMAL &&
(aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);
@@ -2797,8 +2796,7 @@ static int atyfb_blank(int blank, struct
}
aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);

-#ifdef CONFIG_FB_ATY_BACKLIGHT
-#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
+#ifdef CONFIG_FB_ATY_GENERIC_LCD
if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
(aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);

2007-08-26 16:05:20

by Ville Syrjälä

Subject: Re: [PATCH] atyfb: remove dead code

On Sun, Aug 26, 2007 at 11:12:37AM +0200, Olaf Hering wrote:
> Remove dead code.
>
> Signed-off-by: Olaf Hering <[email protected]>
>
> ---
> drivers/video/aty/atyfb_base.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> --- a/drivers/video/aty/atyfb_base.c
> +++ b/drivers/video/aty/atyfb_base.c
> @@ -2767,8 +2767,7 @@ static int atyfb_blank(int blank, struct
> if (par->lock_blank || par->asleep)
> return 0;
>
> -#ifdef CONFIG_FB_ATY_BACKLIGHT
> -#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
> +#ifdef CONFIG_FB_ATY_GENERIC_LCD
> if (par->lcd_table && blank > FB_BLANK_NORMAL &&
> (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
> u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);

This will change the behavior of the code. I basically agree with the
change because the current code will not control the backlight when the
kernel is built with CONFIG_FB_ATY_BACKLIGHT but the system doesn't
support the backlight interface (ie. non-pmac system). However someone
should check that it doesn't cause problems for pmac users.

--
Ville Syrj?l?
[email protected]
http://www.sci.fi/~syrjala/