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

Commit 50cd0221 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

atyfb: remove dead code 



Remove dead code.  This will slightly change the behaviour of the driver
on systems that support backlight control.  Previously they would just
turn the backlight off using the backlight control but now the generic LCD
code will also turn off the LCD using the POWER_MANAGEMENT register.

Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Signed-off-by: default avatarVille Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7572a1ea

drivers/video/aty/atyfb_base.c

+2 −4
Original line number Diff line number Diff line
@@ -2709,8 +2709,7 @@ static int atyfb_blank(int blank, struct fb_info *info) 
	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);
@@ -2739,8 +2738,7 @@ static int atyfb_blank(int blank, struct fb_info *info) 
	}

	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);