[PATCH] atyfb: remove dead code

[PATCH] atyfb: remove dead code

[Olaf Hering]

Remove dead code.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

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

Re: [PATCH] atyfb: remove dead code

[Ville Syrjälä]

On Sun, Aug 26, 2007 at 11:12:37AM +0200, Olaf Hering wrote:
> Remove dead code.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  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ä
syrjala@sci.fi
http://www.sci.fi/~syrjala/

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

Re: [PATCH] atyfb: remove dead code

[Ville Syrjälä]

On Sun, Aug 26, 2007 at 11:12:37AM +0200, Olaf Hering wrote:
> Remove dead code.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  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ä
syrjala@sci.fi
http://www.sci.fi/~syrjala/

[PATCH] fbdev: width and height are unsigned

[Ville Syrjala]

The width and height members of fb_var_screeninfo are __u32. The code
initializes them to -1 which seems wrong, and 0 seems like an equally
good default value.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
---
 drivers/video/fbmon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 052e180..6a0aa18 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -879,7 +879,7 @@ int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
 		if (edid_is_timing_block(block)) {
 			var->xres = var->xres_virtual = H_ACTIVE;
 			var->yres = var->yres_virtual = V_ACTIVE;
-			var->height = var->width = -1;
+			var->height = var->width = 0;
 			var->right_margin = H_SYNC_OFFSET;
 			var->left_margin = (H_ACTIVE + H_BLANKING) -
 				(H_ACTIVE + H_SYNC_OFFSET + H_SYNC_WIDTH);
-- 
1.5.3.7


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[PATCH] fbdev: xoffset, yoffset and yres are unsigned

[Ville Syrjala]

The xoffset, yoffset and yres members of fb_var_screeninfo are __u32.
Make them unsigned in the code as well.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
---
 drivers/video/fbmem.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 776f7fc..5554670 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -848,9 +848,8 @@ int
 fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
 {
 	struct fb_fix_screeninfo *fix = &info->fix;
-        int xoffset = var->xoffset;
-        int yoffset = var->yoffset;
-        int err = 0, yres = info->var.yres;
+	unsigned int yres = info->var.yres;
+	int err = 0;
 
 	if (var->yoffset > 0) {
 		if (var->vmode & FB_VMODE_YWRAP) {
@@ -866,8 +865,8 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
 				 (var->xoffset % fix->xpanstep)))
 		err = -EINVAL;
 
-        if (err || !info->fbops->fb_pan_display || xoffset < 0 ||
-	    yoffset < 0 || var->yoffset + yres > info->var.yres_virtual ||
+	if (err || !info->fbops->fb_pan_display ||
+	    var->yoffset + yres > info->var.yres_virtual ||
 	    var->xoffset + info->var.xres > info->var.xres_virtual)
 		return -EINVAL;
 
-- 
1.5.3.7


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[PATCH] atyfb: Remove dead code.

[Ville Syrjala]

From: Olaf Hering <olaf@aepfle.de>

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: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
---
Nobody has come forward to test this on one of the affected systems
(ie. pmac laptops that support backlight control) so let's just put it
in. It really shouldn't break anything and it helps if some non-pmac
user has unwittingly configured his kernel with CONFIG_FB_ATY_BACKLIGHT.

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

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index bd4ac0b..d7ba3f1 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -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);
-- 
1.5.3.7


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php