diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-07-11 17:50:25 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-07-18 07:56:17 +0200 |
| commit | f3bd0c2b637e3c4f733ff5ac5175cbcef96c2671 (patch) | |
| tree | e43c87b320f929ae5795160ef594027462d5c460 /drivers/video | |
| parent | 6a7d270e901965b0f8643db885cdc2e6e93b8621 (diff) | |
| download | linux-f3bd0c2b637e3c4f733ff5ac5175cbcef96c2671.tar.gz | |
video: fbdev: atari: Simplify atafb_pan_display()
The fb_pan_display() function in the core already takes care of validating the panning parameters before calling the driver's .fb_pan_display() callback, and of updating the panning state afterwards, so there is no need to repeat that in the driver. Remove the duplicate code. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Tested-by: Michael Schmitz <schmitzmic@gmail.com> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/atafb.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c index 102c727cedc0..c0683d2a4efa 100644 --- a/drivers/video/fbdev/atafb.c +++ b/drivers/video/fbdev/atafb.c @@ -2407,35 +2407,10 @@ static void atafb_set_disp(struct fb_info *info) static int atafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) { - int xoffset = var->xoffset; - int yoffset = var->yoffset; - int err; - - if (var->vmode & FB_VMODE_YWRAP) { - if (yoffset < 0 || yoffset >= info->var.yres_virtual || xoffset) - return -EINVAL; - } else { - if (xoffset + info->var.xres > info->var.xres_virtual || - yoffset + info->var.yres > info->var.yres_virtual) - return -EINVAL; - } - - if (fbhw->pan_display) { - err = fbhw->pan_display(var, info); - if (err) - return err; - } else + if (!fbhw->pan_display) return -EINVAL; - info->var.xoffset = xoffset; - info->var.yoffset = yoffset; - - if (var->vmode & FB_VMODE_YWRAP) - info->var.vmode |= FB_VMODE_YWRAP; - else - info->var.vmode &= ~FB_VMODE_YWRAP; - - return 0; + return fbhw->pan_display(var, info); } /* |