fbdev/i740fb: Use fbdev I/O helpers

Set struct fb_ops and with FB_DEFAULT_IOMEM_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_IOMEM_HELPERS token.

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

v3:
	* use _IOMEM_ in commit message
v2:
	* updated to use _IOMEM_ tokens

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Helge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230803184034.6456-20-tzimmermann@suse.de

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index ee29f323c2b47877d8eefaca41b47bff2c22e5d6..1594c34180e3782478ed62d10eeaeb5216dc515b 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -809,10 +809,8 @@ config FB_RIVA_BACKLIGHT
 config FB_I740
        tristate "Intel740 support"
        depends on FB && PCI
+       select FB_IOMEM_HELPERS
        select FB_MODE_HELPERS
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
        select VGASTATE
        select VIDEO_NOMODESET
        select FB_DDC

diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c
index 3f5becfe9fd519c24a191e5cc20a6af93635c98f..1897e65ab7031dfbf9f3e907ac245661bc88ba18 100644 (file)
--- a/drivers/video/fbdev/i740fb.c
+++ b/drivers/video/fbdev/i740fb.c
@@ -994,14 +994,12 @@ static const struct fb_ops i740fb_ops = {
        .owner          = THIS_MODULE,
        .fb_open        = i740fb_open,
        .fb_release     = i740fb_release,
+       FB_DEFAULT_IOMEM_OPS,
        .fb_check_var   = i740fb_check_var,
        .fb_set_par     = i740fb_set_par,
        .fb_setcolreg   = i740fb_setcolreg,
        .fb_blank       = i740fb_blank,
        .fb_pan_display = i740fb_pan_display,
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
 };
 
 /* ------------------------------------------------------------------------- */