Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+16 -16
+1 -1
drivers/gpu/drm/armada/Kconfig
··· 3 3 tristate "DRM support for Marvell Armada SoCs" 4 4 depends on DRM && HAVE_CLK && ARM && MMU 5 5 select DRM_KMS_HELPER 6 - select FB_IO_HELPERS if DRM_FBDEV_EMULATION 6 + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION 7 7 help 8 8 Support the "LCD" controllers found on the Marvell Armada 510 9 9 devices. There are two controllers on the device, each controller
+1 -1
drivers/gpu/drm/armada/armada_fbdev.c
··· 34 34 35 35 static const struct fb_ops armada_fb_ops = { 36 36 .owner = THIS_MODULE, 37 - FB_DEFAULT_IO_OPS, 37 + FB_DEFAULT_IOMEM_OPS, 38 38 DRM_FB_HELPER_DEFAULT_OPS, 39 39 .fb_destroy = armada_fbdev_fb_destroy, 40 40 };
+1 -1
drivers/gpu/drm/gma500/Kconfig
··· 3 3 tristate "Intel GMA500/600/3600/3650 KMS Framebuffer" 4 4 depends on DRM && PCI && X86 && MMU 5 5 select DRM_KMS_HELPER 6 - select FB_IO_HELPERS if DRM_FBDEV_EMULATION 6 + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION 7 7 select I2C 8 8 select I2C_ALGOBIT 9 9 # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
+2 -2
drivers/gpu/drm/gma500/fbdev.c
··· 135 135 136 136 static const struct fb_ops psb_fbdev_fb_ops = { 137 137 .owner = THIS_MODULE, 138 - __FB_DEFAULT_IO_OPS_RDWR, 138 + __FB_DEFAULT_IOMEM_OPS_RDWR, 139 139 DRM_FB_HELPER_DEFAULT_OPS, 140 140 .fb_setcolreg = psb_fbdev_fb_setcolreg, 141 - __FB_DEFAULT_IO_OPS_DRAW, 141 + __FB_DEFAULT_IOMEM_OPS_DRAW, 142 142 .fb_mmap = psb_fbdev_fb_mmap, 143 143 .fb_destroy = psb_fbdev_fb_destroy, 144 144 };
+1 -1
drivers/gpu/drm/i915/Kconfig
··· 17 17 select DRM_KMS_HELPER 18 18 select DRM_PANEL 19 19 select DRM_MIPI_DSI 20 - select FB_IO_HELPERS if DRM_FBDEV_EMULATION 20 + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION 21 21 select RELAY 22 22 select I2C 23 23 select I2C_ALGOBIT
+1 -1
drivers/gpu/drm/radeon/Kconfig
··· 11 11 select DRM_SUBALLOC_HELPER 12 12 select DRM_TTM 13 13 select DRM_TTM_HELPER 14 - select FB_IO_HELPERS if DRM_FBDEV_EMULATION 14 + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION 15 15 select SND_HDA_COMPONENT if SND_HDA_CORE 16 16 select POWER_SUPPLY 17 17 select HWMON
+1 -1
drivers/gpu/drm/radeon/radeon_fbdev.c
··· 193 193 .owner = THIS_MODULE, 194 194 .fb_open = radeon_fbdev_fb_open, 195 195 .fb_release = radeon_fbdev_fb_release, 196 - FB_DEFAULT_IO_OPS, 196 + FB_DEFAULT_IOMEM_OPS, 197 197 DRM_FB_HELPER_DEFAULT_OPS, 198 198 .fb_destroy = radeon_fbdev_fb_destroy, 199 199 };
+1 -1
drivers/video/fbdev/core/Kconfig
··· 144 144 select FB_SYS_FOPS 145 145 select FB_SYS_IMAGEBLIT 146 146 147 - config FB_IO_HELPERS 147 + config FB_IOMEM_HELPERS 148 148 bool 149 149 depends on FB_CORE 150 150 select FB_CFB_COPYAREA
+7 -7
include/linux/fb.h
··· 537 537 extern ssize_t fb_io_write(struct fb_info *info, const char __user *buf, 538 538 size_t count, loff_t *ppos); 539 539 540 - #define __FB_DEFAULT_IO_OPS_RDWR \ 540 + #define __FB_DEFAULT_IOMEM_OPS_RDWR \ 541 541 .fb_read = fb_io_read, \ 542 542 .fb_write = fb_io_write 543 543 544 - #define __FB_DEFAULT_IO_OPS_DRAW \ 544 + #define __FB_DEFAULT_IOMEM_OPS_DRAW \ 545 545 .fb_fillrect = cfb_fillrect, \ 546 546 .fb_copyarea = cfb_copyarea, \ 547 547 .fb_imageblit = cfb_imageblit 548 548 549 - #define __FB_DEFAULT_IO_OPS_MMAP \ 549 + #define __FB_DEFAULT_IOMEM_OPS_MMAP \ 550 550 .fb_mmap = NULL /* default implementation */ 551 551 552 - #define FB_DEFAULT_IO_OPS \ 553 - __FB_DEFAULT_IO_OPS_RDWR, \ 554 - __FB_DEFAULT_IO_OPS_DRAW, \ 555 - __FB_DEFAULT_IO_OPS_MMAP 552 + #define FB_DEFAULT_IOMEM_OPS \ 553 + __FB_DEFAULT_IOMEM_OPS_RDWR, \ 554 + __FB_DEFAULT_IOMEM_OPS_DRAW, \ 555 + __FB_DEFAULT_IOMEM_OPS_MMAP 556 556 557 557 /* 558 558 * Helpers for framebuffers in system memory