Commit 4520844b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230729193157.15446-2-tzimmermann@suse.de
parent 7a675a8f

drivers/gpu/drm/armada/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/armada/armada_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/gpu/drm/gma500/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/gma500/fbdev.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

};

drivers/gpu/drm/i915/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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