Re: [Linux-fbdev-devel] [PATCH 2/2] vgacon: vgacon_scrolldelta simplification

[Krzysztof H. <krz...@po...>]

On Sun, 21 Sep 2008 18:00:09 +0200
Marcin Slusarz <mar...@gm...> wrote:

> There's no point in checking diff == c->vc_rows, because it can be true
> only when count == 0, but we already checked that.
> Additionally move variables used only in one block to this block.
> 
> Signed-off-by: Marcin Slusarz <mar...@gm...>
> Cc: Antonino Daplas <ad...@gm...>
> Cc: lin...@li...
> ---

Acked-by: Krzysztof Helt <krz...@wp...>


>  drivers/video/console/vgacon.c |   22 +++++++++-------------
>  1 files changed, 9 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
> index de4f66c..a785f99 100644
> --- a/drivers/video/console/vgacon.c
> +++ b/drivers/video/console/vgacon.c
> @@ -239,8 +239,7 @@ static void vgacon_restore_screen(struct vc_data *c)
>  
>  static int vgacon_scrolldelta(struct vc_data *c, int lines)
>  {
> -	int start, end, count, soff, diff;
> -	void *d, *s;
> +	int start, end, count, soff;
>  
>  	if (!lines) {
>  		c->vc_visible_origin = c->vc_origin;
> @@ -287,13 +286,13 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
>  	if (count > c->vc_rows)
>  		count = c->vc_rows;
>  
> -	diff = c->vc_rows - count;
> -
> -	d = (void *) c->vc_origin;
> -	s = (void *) c->vc_screenbuf;
> -
>  	if (count) {
>  		int copysize;
> +		
> +		int diff = c->vc_rows - count;
> +		void *d = (void *) c->vc_origin;
> +		void *s = (void *) c->vc_screenbuf;
> +		
>  		count *= c->vc_size_row;
>  		/* how much memory to end of buffer left? */
>  		copysize = min(count, vgacon_scrollback_size - soff);
> @@ -306,14 +305,11 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
>  			scr_memcpyw(d, vgacon_scrollback, copysize);
>  			d += copysize;
>  		}
> -	}
> -
> -	if (diff == c->vc_rows) {
> -		vgacon_cursor(c, CM_MOVE);
> -	} else {
> +		
>  		if (diff)
>  			scr_memcpyw(d, s, diff * c->vc_size_row);
> -	}
> +	} else
> +		vgacon_cursor(c, CM_MOVE);
>  
>  	return 1;
>  }
> -- 
> 1.5.6.4
> 
> 
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Linux-fbdev-devel mailing list
> Lin...@li...
> https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel
> 

----------------------------------------------------------------------
Znajd¼ mieszkanie w Twoim regionie!
kliknij >>> http://link.interia.pl/f1f19