fbdev: Use _IOMEM_ infix for I/O-memory helpers

Change the infix for fbdev's I/O-memory helpers from _IO_ to _IOMEM_
to distiguish them from other types of I/O, such as file operations.
The helpers operate on memory ranges in the I/O address space and the
naming should make this clear. Adapt all users. No functional changes.

Suggested-by: Helge Deller <deller@gmx.de>
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/20230729193157.15446-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig
index 5afade2..e5597d7 100644 (file)
--- a/drivers/gpu/drm/armada/Kconfig
+++ b/drivers/gpu/drm/armada/Kconfig
@@ -3,7 +3,7 @@ config DRM_ARMADA
        tristate "DRM support for Marvell Armada SoCs"
        depends on DRM && HAVE_CLK && ARM && MMU
        select DRM_KMS_HELPER
-       select FB_IO_HELPERS if DRM_FBDEV_EMULATION
+       select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
        help
          Support the "LCD" controllers found on the Marvell Armada 510
          devices.  There are two controllers on the device, each controller

diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index e40a95e..d223176 100644 (file)
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -34,7 +34,7 @@ static void armada_fbdev_fb_destroy(struct fb_info *info)
 
 static const struct fb_ops armada_fb_ops = {
        .owner          = THIS_MODULE,
-       FB_DEFAULT_IO_OPS,
+       FB_DEFAULT_IOMEM_OPS,
        DRM_FB_HELPER_DEFAULT_OPS,
        .fb_destroy     = armada_fbdev_fb_destroy,
 };

diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig
index cd3d927..efb4a2d 100644 (file)
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@ -3,7 +3,7 @@ config DRM_GMA500
        tristate "Intel GMA500/600/3600/3650 KMS Framebuffer"
        depends on DRM && PCI && X86 && MMU
        select DRM_KMS_HELPER
-       select FB_IO_HELPERS if DRM_FBDEV_EMULATION
+       select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
        select I2C
        select I2C_ALGOBIT
        # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915

diff --git a/drivers/gpu/drm/gma500/fbdev.c b/drivers/gpu/drm/gma500/fbdev.c
index be8f5fb..98b4497 100644 (file)
--- a/drivers/gpu/drm/gma500/fbdev.c
+++ b/drivers/gpu/drm/gma500/fbdev.c
@@ -135,10 +135,10 @@ static void psb_fbdev_fb_destroy(struct fb_info *info)
 
 static const struct fb_ops psb_fbdev_fb_ops = {
        .owner = THIS_MODULE,
-       __FB_DEFAULT_IO_OPS_RDWR,
+       __FB_DEFAULT_IOMEM_OPS_RDWR,
        DRM_FB_HELPER_DEFAULT_OPS,
        .fb_setcolreg = psb_fbdev_fb_setcolreg,
-       __FB_DEFAULT_IO_OPS_DRAW,
+       __FB_DEFAULT_IOMEM_OPS_DRAW,
        .fb_mmap = psb_fbdev_fb_mmap,
        .fb_destroy = psb_fbdev_fb_destroy,
 };

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 01b5a82..ce397a8 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -17,7 +17,7 @@ config DRM_I915
        select DRM_KMS_HELPER
        select DRM_PANEL
        select DRM_MIPI_DSI
-       select FB_IO_HELPERS if DRM_FBDEV_EMULATION
+       select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
        select RELAY
        select I2C
        select I2C_ALGOBIT

diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
index fe498c8..f98356b 100644 (file)
--- a/drivers/gpu/drm/radeon/Kconfig
+++ b/drivers/gpu/drm/radeon/Kconfig
@@ -11,7 +11,7 @@ config DRM_RADEON
        select DRM_SUBALLOC_HELPER
         select DRM_TTM
        select DRM_TTM_HELPER
-       select FB_IO_HELPERS if DRM_FBDEV_EMULATION
+       select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
        select SND_HDA_COMPONENT if SND_HDA_CORE
        select POWER_SUPPLY
        select HWMON

diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c b/drivers/gpu/drm/radeon/radeon_fbdev.c
index 68c06ac..02bf257 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fbdev.c
+++ b/drivers/gpu/drm/radeon/radeon_fbdev.c
@@ -193,7 +193,7 @@ static const struct fb_ops radeon_fbdev_fb_ops = {
        .owner = THIS_MODULE,
        .fb_open = radeon_fbdev_fb_open,
        .fb_release = radeon_fbdev_fb_release,
-       FB_DEFAULT_IO_OPS,
+       FB_DEFAULT_IOMEM_OPS,
        DRM_FB_HELPER_DEFAULT_OPS,
        .fb_destroy = radeon_fbdev_fb_destroy,
 };

diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 8543438..6d562f8 100644 (file)
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -144,7 +144,7 @@ config FB_DMA_HELPERS
        select FB_SYS_FOPS
        select FB_SYS_IMAGEBLIT
 
-config FB_IO_HELPERS
+config FB_IOMEM_HELPERS
        bool
        depends on FB_CORE
        select FB_CFB_COPYAREA

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 2ef7788..bb5eb98 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -537,22 +537,22 @@ extern ssize_t fb_io_read(struct fb_info *info, char __user *buf,
 extern ssize_t fb_io_write(struct fb_info *info, const char __user *buf,
                           size_t count, loff_t *ppos);
 
-#define __FB_DEFAULT_IO_OPS_RDWR \
+#define __FB_DEFAULT_IOMEM_OPS_RDWR \
        .fb_read        = fb_io_read, \
        .fb_write       = fb_io_write
 
-#define __FB_DEFAULT_IO_OPS_DRAW \
+#define __FB_DEFAULT_IOMEM_OPS_DRAW \
        .fb_fillrect    = cfb_fillrect, \
        .fb_copyarea    = cfb_copyarea, \
        .fb_imageblit   = cfb_imageblit
 
-#define __FB_DEFAULT_IO_OPS_MMAP \
+#define __FB_DEFAULT_IOMEM_OPS_MMAP \
        .fb_mmap        = NULL /* default implementation */
 
-#define FB_DEFAULT_IO_OPS \
-       __FB_DEFAULT_IO_OPS_RDWR, \
-       __FB_DEFAULT_IO_OPS_DRAW, \
-       __FB_DEFAULT_IO_OPS_MMAP
+#define FB_DEFAULT_IOMEM_OPS \
+       __FB_DEFAULT_IOMEM_OPS_RDWR, \
+       __FB_DEFAULT_IOMEM_OPS_DRAW, \
+       __FB_DEFAULT_IOMEM_OPS_MMAP
 
 /*
  * Helpers for framebuffers in system memory