fbdev: Use _SYSMEM_ infix for system-memory helpers

Change the infix for fbdev's system-memory helpers from _SYS_ to
_SYSMEM_. The helpers perform operations within system memory, but
not on the state of the operating system itself. 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-3-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 0d499669d65360cfc5fbb5f64bdee10aa1844887..34da733e8606857236cfc2e47068e229d9934659 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -11,7 +11,7 @@ menuconfig DRM
        select DRM_PANEL_ORIENTATION_QUIRKS
        select DRM_KMS_HELPER if DRM_FBDEV_EMULATION
        select FB_CORE if DRM_FBDEV_EMULATION
-       select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION
+       select FB_SYSMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION
        select HDMI
        select I2C
        select DMA_SHARED_BUFFER

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index a78662bd62730c48dc209330e91191244d0c1d3e..6309a857ca312869e37f9e9021195efd9a01d4ff 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -21,7 +21,7 @@ config DRM_MSM
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE
        select DRM_SCHED
-       select FB_SYS_HELPERS if DRM_FBDEV_EMULATION
+       select FB_SYSMEM_HELPERS if DRM_FBDEV_EMULATION
        select SHMEM
        select TMPFS
        select QCOM_SCM

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index c0b0419e98b69df603be753adc5c94b1fa98b5c3..5f8392b4f2a1ea3f54f92caed87dec9e96d0c7f2 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -48,7 +48,7 @@ menuconfig FB
 config FB_HECUBA
        tristate
        depends on FB
-       select FB_SYS_HELPERS_DEFERRED
+       select FB_SYSMEM_HELPERS_DEFERRED
 
 config FB_SVGALIB
        tristate
@@ -1886,7 +1886,7 @@ config FB_VIRTUAL
 config XEN_FBDEV_FRONTEND
        tristate "Xen virtual frame buffer support"
        depends on FB && XEN
-       select FB_SYS_HELPERS_DEFERRED
+       select FB_SYSMEM_HELPERS_DEFERRED
        select XEN_XENBUS_FRONTEND
        default y
        help
@@ -1897,7 +1897,7 @@ config XEN_FBDEV_FRONTEND
 config FB_METRONOME
        tristate "E-Ink Metronome/8track controller support"
        depends on FB
-       select FB_SYS_HELPERS_DEFERRED
+       select FB_SYSMEM_HELPERS_DEFERRED
        help
          This driver implements support for the E-Ink Metronome
          controller. The pre-release name for this device was 8track
@@ -1979,7 +1979,7 @@ config FB_MX3
 config FB_BROADSHEET
        tristate "E-Ink Broadsheet/Epson S1D13521 controller support"
        depends on FB && (ARCH_PXA || COMPILE_TEST)
-       select FB_SYS_HELPERS_DEFERRED
+       select FB_SYSMEM_HELPERS_DEFERRED
        help
          This driver implements support for the E-Ink Broadsheet
          controller. The release name for this device was Epson S1D13521
@@ -2021,7 +2021,7 @@ config FB_SSD1307
        depends on FB && I2C
        depends on GPIOLIB || COMPILE_TEST
        select FB_BACKLIGHT
-       select FB_SYS_HELPERS_DEFERRED
+       select FB_SYSMEM_HELPERS_DEFERRED
        help
          This driver implements support for the Solomon SSD1307
          OLED controller over I2C.

diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 6d562f83dcc2af94d4e667ac3c8b27b3b1bfdf39..28e771a46df62c03fedb42dc243e0e2d58c80c2c 100644 (file)
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -151,7 +151,7 @@ config FB_IOMEM_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_IMAGEBLIT
 
-config FB_SYS_HELPERS
+config FB_SYSMEM_HELPERS
        bool
        depends on FB_CORE
        select FB_SYS_COPYAREA
@@ -159,11 +159,11 @@ config FB_SYS_HELPERS
        select FB_SYS_FOPS
        select FB_SYS_IMAGEBLIT
 
-config FB_SYS_HELPERS_DEFERRED
+config FB_SYSMEM_HELPERS_DEFERRED
        bool
        depends on FB_CORE
        select FB_DEFERRED_IO
-       select FB_SYS_HELPERS
+       select FB_SYSMEM_HELPERS
 
 config FB_BACKLIGHT
        tristate

diff --git a/include/linux/fb.h b/include/linux/fb.h
index bb5eb98cde83b2c8a17a795e4d5c8ca371a78449..76472482dc30637bbced12333ef44ff79da3502c 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -566,11 +566,11 @@ extern ssize_t fb_sys_read(struct fb_info *info, char __user *buf,
 extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
                            size_t count, loff_t *ppos);
 
-#define __FB_DEFAULT_SYS_OPS_RDWR \
+#define __FB_DEFAULT_SYSMEM_OPS_RDWR \
        .fb_read        = fb_sys_read, \
        .fb_write       = fb_sys_write
 
-#define __FB_DEFAULT_SYS_OPS_DRAW \
+#define __FB_DEFAULT_SYSMEM_OPS_DRAW \
        .fb_fillrect    = sys_fillrect, \
        .fb_copyarea    = sys_copyarea, \
        .fb_imageblit   = sys_imageblit