fbdev/sa1100fb: Initialize fb_ops to fbdev I/O-memory helpers

Initialize the instance of struct fb_ops with fbdev initializer
macros for framebuffers in I/O address space. Set the read/write,
draw and mmap callbacks to the correct implementation and avoid
implicit defaults. Also select the necessary I/O helpers in Kconfig.

Fbdev drivers sometimes rely on the callbacks being NULL for a
default implementation to be invoked; hence requiring the I/O
helpers to be built in any case. Setting all callbacks in all
drivers explicitly will allow to make the I/O helpers optional.
This benefits systems that do not use these functions.

No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230927074722.6197-34-tzimmermann@suse.de

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index ea63ad8b5be7261bd3bd638dd63213cf66f945ec..cf4c599b390a6d0534f0f83741e384d1c0704c8a 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -159,9 +159,7 @@ config FB_CLPS711X
 config FB_SA1100
        bool "SA-1100 LCD support"
        depends on (FB = y) && ARM && ARCH_SA1100
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
+       select FB_IOMEM_HELPERS
        help
          This is a framebuffer device for the SA-1100 LCD Controller.
          See <http://www.linux-fbdev.org/> for information on framebuffer

diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c
index 3d76ce11148826a169bd0f0251424262024a2d66..446b44e172e152b0bffd9812637ee114656d9b0b 100644 (file)
--- a/drivers/video/fbdev/sa1100fb.c
+++ b/drivers/video/fbdev/sa1100fb.c
@@ -575,14 +575,13 @@ static int sa1100fb_mmap(struct fb_info *info,
 
 static const struct fb_ops sa1100fb_ops = {
        .owner          = THIS_MODULE,
+       __FB_DEFAULT_IOMEM_OPS_RDWR,
        .fb_check_var   = sa1100fb_check_var,
        .fb_set_par     = sa1100fb_set_par,
 //     .fb_set_cmap    = sa1100fb_set_cmap,
        .fb_setcolreg   = sa1100fb_setcolreg,
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
        .fb_blank       = sa1100fb_blank,
+       __FB_DEFAULT_IOMEM_OPS_DRAW,
        .fb_mmap        = sa1100fb_mmap,
 };