diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-01-09 23:53:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:47 -0500 |
| commit | 32cf8c1e50ac9d49f348e886c6e664cdc37aaead (patch) | |
| tree | 53c930adb8784295f548d6e8e707e0ec9c6ddbb9 | |
| parent | 198a52a1c490be89a8d5d130eda972630919e0af (diff) | |
[PATCH] savagefb: Trim savagefb_pan_display
Remove error checking and updating from savagefb_pan_display. This is
guaranteed to be done by the core layer.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/savage/savagefb_driver.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index baddd2b320bd..ab727eaa7f43 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
| @@ -1382,28 +1382,8 @@ static int savagefb_pan_display (struct fb_var_screeninfo *var, | |||
| 1382 | struct fb_info *info) | 1382 | struct fb_info *info) |
| 1383 | { | 1383 | { |
| 1384 | struct savagefb_par *par = info->par; | 1384 | struct savagefb_par *par = info->par; |
| 1385 | u_int y_bottom; | ||
| 1386 | |||
| 1387 | y_bottom = var->yoffset; | ||
| 1388 | |||
| 1389 | if (!(var->vmode & FB_VMODE_YWRAP)) | ||
| 1390 | y_bottom += var->yres; | ||
| 1391 | |||
| 1392 | if (var->xoffset > (var->xres_virtual - var->xres)) | ||
| 1393 | return -EINVAL; | ||
| 1394 | if (y_bottom > info->var.yres_virtual) | ||
| 1395 | return -EINVAL; | ||
| 1396 | 1385 | ||
| 1397 | savagefb_update_start (par, var); | 1386 | savagefb_update_start (par, var); |
| 1398 | |||
| 1399 | info->var.xoffset = var->xoffset; | ||
| 1400 | info->var.yoffset = var->yoffset; | ||
| 1401 | |||
| 1402 | if (var->vmode & FB_VMODE_YWRAP) | ||
| 1403 | info->var.vmode |= FB_VMODE_YWRAP; | ||
| 1404 | else | ||
| 1405 | info->var.vmode &= ~FB_VMODE_YWRAP; | ||
| 1406 | |||
| 1407 | return 0; | 1387 | return 0; |
| 1408 | } | 1388 | } |
| 1409 | 1389 | ||
