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 <[email protected]>
---
 drivers/video/fbdev/Kconfig        | 1 +
 drivers/video/fbdev/cobalt_lcdfb.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 06d20787da8b8..5f8ba796aa382 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -1752,6 +1752,7 @@ config FB_GOLDFISH
 config FB_COBALT
        tristate "Cobalt server LCD frame buffer support"
        depends on FB && MIPS_COBALT
+       select FB_IOMEM_HELPERS
 
 config FB_SH7760
        bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
diff --git a/drivers/video/fbdev/cobalt_lcdfb.c 
b/drivers/video/fbdev/cobalt_lcdfb.c
index b94e7c97264cb..c2b8f894799ca 100644
--- a/drivers/video/fbdev/cobalt_lcdfb.c
+++ b/drivers/video/fbdev/cobalt_lcdfb.c
@@ -280,7 +280,9 @@ static const struct fb_ops cobalt_lcd_fbops = {
        .fb_read        = cobalt_lcdfb_read,
        .fb_write       = cobalt_lcdfb_write,
        .fb_blank       = cobalt_lcdfb_blank,
+       __FB_DEFAULT_IOMEM_OPS_DRAW,
        .fb_cursor      = cobalt_lcdfb_cursor,
+       __FB_DEFAULT_IOMEM_OPS_MMAP,
 };
 
 static int cobalt_lcdfb_probe(struct platform_device *dev)
-- 
2.42.0

Reply via email to