video: fbdev: atyfb: modify the static fb_ops directly

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/7dfbf1d47203157f5eb9a6f447f0095765d0b5e6.1575390740.git.jani.nikula@intel.com

diff --git a/drivers/video/fbdev/aty/atyfb.h b/drivers/video/fbdev/aty/atyfb.h
index e5a347c581801f6e4769df1fdf517e24d4a87ec1..a7833bc98225f71c594bb9c7b1f3f980cf0982a3 100644 (file)
--- a/drivers/video/fbdev/aty/atyfb.h
+++ b/drivers/video/fbdev/aty/atyfb.h
@@ -341,7 +341,7 @@ extern const u8 aty_postdividers[8];
      *  Hardware cursor support
      */
 
-extern int aty_init_cursor(struct fb_info *info);
+extern int aty_init_cursor(struct fb_info *info, struct fb_ops *atyfb_ops);
 
     /*
      *  Hardware acceleration

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 6dda5d885a03b0e8b17d18e2b873d8b6da8cd085..bebc08505d940209a8b56324b7a7432f74ec2d22 100644 (file)
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -1316,10 +1316,10 @@ static int atyfb_set_par(struct fb_info *info)
        par->accel_flags = var->accel_flags; /* hack */
 
        if (var->accel_flags) {
-               info->fbops->fb_sync = atyfb_sync;
+               atyfb_ops.fb_sync = atyfb_sync;
                info->flags &= ~FBINFO_HWACCEL_DISABLED;
        } else {
-               info->fbops->fb_sync = NULL;
+               atyfb_ops.fb_sync = NULL;
                info->flags |= FBINFO_HWACCEL_DISABLED;
        }
 
@@ -2702,7 +2702,7 @@ static int aty_init(struct fb_info *info)
 
 #ifdef CONFIG_FB_ATY_CT
        if (!noaccel && M64_HAS(INTEGRATED))
-               aty_init_cursor(info);
+               aty_init_cursor(info, &atyfb_ops);
 #endif /* CONFIG_FB_ATY_CT */
        info->var = var;
 

diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
index 4cde25eab8e89f08517d86bd75d1c3f256e8f06a..b06fa6e42e6e04a8dfad987258eba70d6458a606 100644 (file)
--- a/drivers/video/fbdev/aty/mach64_cursor.c
+++ b/drivers/video/fbdev/aty/mach64_cursor.c
@@ -194,7 +194,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
        return 0;
 }
 
-int aty_init_cursor(struct fb_info *info)
+int aty_init_cursor(struct fb_info *info, struct fb_ops *atyfb_ops)
 {
        unsigned long addr;
 
@@ -219,7 +219,7 @@ int aty_init_cursor(struct fb_info *info)
        info->sprite.buf_align = 16;    /* and 64 lines tall. */
        info->sprite.flags = FB_PIXMAP_IO;
 
-       info->fbops->fb_cursor = atyfb_cursor;
+       atyfb_ops->fb_cursor = atyfb_cursor;
 
        return 0;
 }