Set struct fb_ops and with FB_DEFAULT_IO_OPS, fbdev's initializer
for I/O memory. Sets the callbacks to the cfb_ and fb_io_ functions.
Select the correct modules with Kconfig's FB_IO_HELPERS token.

The macro and token set the currently selected values, so there is
no functional change.

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
---
 drivers/video/fbdev/Kconfig    | 4 +---
 drivers/video/fbdev/da8xx-fb.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 02fa97d84eca..b10aac21eca2 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -1837,9 +1837,7 @@ config FB_DA8XX
        tristate "DA8xx/OMAP-L1xx/AM335x Framebuffer support"
        depends on FB && HAVE_CLK && HAS_IOMEM
        depends on ARCH_DAVINCI_DA8XX || SOC_AM33XX || COMPILE_TEST
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
+       select FB_IO_HELPERS
        select FB_CFB_REV_PIXELS_IN_BYTE
        select FB_MODE_HELPERS
        select VIDEOMODE_HELPERS
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 988dedcf6be8..6a0e919eb43d 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -1295,14 +1295,12 @@ static int da8xxfb_set_par(struct fb_info *info)
 
 static const struct fb_ops da8xx_fb_ops = {
        .owner = THIS_MODULE,
+       FB_DEFAULT_IO_OPS,
        .fb_check_var = fb_check_var,
        .fb_set_par = da8xxfb_set_par,
        .fb_setcolreg = fb_setcolreg,
        .fb_pan_display = da8xx_pan_display,
        .fb_ioctl = fb_ioctl,
-       .fb_fillrect = cfb_fillrect,
-       .fb_copyarea = cfb_copyarea,
-       .fb_imageblit = cfb_imageblit,
        .fb_blank = cfb_blank,
 };
 
-- 
2.41.0

Reply via email to