video: fbdev: vesafb: modify the static fb_ops directly
authorJani Nikula <jani.nikula@intel.com>
Fri, 29 Nov 2019 10:29:35 +0000 (12:29 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 3 Dec 2019 09:11:24 +0000 (11:11 +0200)
Avoid modifying the fb_ops via info->fbops to let us make the pointer
const in the future.

Cc: linux-fbdev@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9e34c1d9a81690cbd75af7969fc4baf60a64b13f.1575022735.git.jani.nikula@intel.com
drivers/video/fbdev/vesafb.c

index d9c08f6c2155899f19734667930fca23574f182d..a1fe24ea869b8b287bd93dd751743709f046b214 100644 (file)
@@ -447,15 +447,15 @@ static int vesafb_probe(struct platform_device *dev)
               vesafb_fix.smem_start, info->screen_base,
               size_remap/1024, size_total/1024);
 
+       if (!ypan)
+               vesafb_ops.fb_pan_display = NULL;
+
        info->fbops = &vesafb_ops;
        info->var = vesafb_defined;
        info->fix = vesafb_fix;
        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
                (ypan ? FBINFO_HWACCEL_YPAN : 0);
 
-       if (!ypan)
-               info->fbops->fb_pan_display = NULL;
-
        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
                err = -ENOMEM;
                goto err;