From: "Antonino A. Daplas" Remove error checking and updating from rivafb_pan_display. This is guaranteed to be done by the core layer. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/riva/fbdev.c | 24 ------------------------ 1 files changed, 24 deletions(-) diff -puN drivers/video/riva/fbdev.c~rivafb-trim-rivafb_pan_display drivers/video/riva/fbdev.c --- devel/drivers/video/riva/fbdev.c~rivafb-trim-rivafb_pan_display 2005-12-10 00:22:00.000000000 -0800 +++ devel-akpm/drivers/video/riva/fbdev.c 2005-12-10 00:22:01.000000000 -0800 @@ -1209,32 +1209,8 @@ static int rivafb_pan_display(struct fb_ unsigned int base; NVTRACE_ENTER(); - if (var->xoffset > (var->xres_virtual - var->xres)) - return -EINVAL; - if (var->yoffset > (var->yres_virtual - var->yres)) - return -EINVAL; - - if (var->vmode & FB_VMODE_YWRAP) { - if (var->yoffset < 0 - || var->yoffset >= info->var.yres_virtual - || var->xoffset) return -EINVAL; - } else { - if (var->xoffset + info->var.xres > info->var.xres_virtual || - var->yoffset + info->var.yres > info->var.yres_virtual) - return -EINVAL; - } - base = var->yoffset * info->fix.line_length + var->xoffset; - par->riva.SetStartAddress(&par->riva, base); - - info->var.xoffset = var->xoffset; - info->var.yoffset = var->yoffset; - - if (var->vmode & FB_VMODE_YWRAP) - info->var.vmode |= FB_VMODE_YWRAP; - else - info->var.vmode &= ~FB_VMODE_YWRAP; NVTRACE_LEAVE(); return 0; } _