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 <tzimmerm...@suse.de>
Reviewed-by: Sam Ravnborg <s...@ravnborg.org>
Acked-by: Helge Deller <del...@gmx.de>
---
 drivers/video/fbdev/Kconfig      | 4 +---
 drivers/video/fbdev/platinumfb.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index a792364419ce..3e249e5188e9 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -321,9 +321,7 @@ config FB_CONTROL
 config FB_PLATINUM
        bool "Apple \"platinum\" display support"
        depends on (FB = y) && PPC_PMAC && PPC32
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
+       select FB_IOMEM_HELPERS
        select FB_MACMODES
        help
          This driver supports a frame buffer for the "platinum" graphics
diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c
index b1fd86fe3f65..cb6fcc64c8e2 100644
--- a/drivers/video/fbdev/platinumfb.c
+++ b/drivers/video/fbdev/platinumfb.c
@@ -98,13 +98,11 @@ static int platinum_var_to_par(struct fb_var_screeninfo 
*var,
 
 static const struct fb_ops platinumfb_ops = {
        .owner =        THIS_MODULE,
+       FB_DEFAULT_IOMEM_OPS,
        .fb_check_var   = platinumfb_check_var,
        .fb_set_par     = platinumfb_set_par,
        .fb_setcolreg   = platinumfb_setcolreg,
        .fb_blank       = platinumfb_blank,
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
 };
 
 /*
-- 
2.41.0

Reply via email to