Commit 20d54e48 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev: Rename fb_mem*() helpers 



Update the names of the fb_mem*() helpers to be consistent with their
regular counterparts. Hence, fb_memset() now becomes fb_memset_io(),
fb_memcpy_fromfb() now becomes fb_memcpy_fromio() and fb_memcpy_tofb()
becomes fb_memcpy_toio(). No functional changes.

v6:
	* update new file fb_io_fops.c

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarSui Jingfeng <suijingfeng@loongson.cn>
Link: https://patchwork.freedesktop.org/patch/msgid/20230512102444.5438-8-tzimmermann@suse.de
parent 8f8eaa1b

arch/ia64/include/asm/fb.h

+6 −6
Original line number Diff line number Diff line
@@ -20,23 +20,23 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, 
}

#define fb_pgprotect fb_pgprotect



static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)

static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)

{

	memcpy(to, (void __force *)from, n);

}

#define fb_memcpy_fromfb fb_memcpy_fromfb

#define fb_memcpy_fromio fb_memcpy_fromio



static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)

static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)

{

	memcpy((void __force *)to, from, n);

}

#define fb_memcpy_tofb fb_memcpy_tofb

#define fb_memcpy_toio fb_memcpy_toio



static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)

static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)

{

	memset((void __force *)addr, c, n);

}

#define fb_memset fb_memset

#define fb_memset fb_memset_io



#include <asm-generic/fb.h>

arch/loongarch/include/asm/fb.h

+6 −6
Original line number Diff line number Diff line
@@ -8,23 +8,23 @@ 
#include <linux/compiler.h>

#include <linux/string.h>



static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)

static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)

{

	memcpy(to, (void __force *)from, n);

}

#define fb_memcpy_fromfb fb_memcpy_fromfb

#define fb_memcpy_fromio fb_memcpy_fromio



static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)

static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)

{

	memcpy((void __force *)to, from, n);

}

#define fb_memcpy_tofb fb_memcpy_tofb

#define fb_memcpy_toio fb_memcpy_toio



static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)

static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)

{

	memset((void __force *)addr, c, n);

}

#define fb_memset fb_memset

#define fb_memset fb_memset_io



#include <asm-generic/fb.h>

arch/sparc/include/asm/fb.h

+6 −6
Original line number Diff line number Diff line
@@ -18,23 +18,23 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, 
int fb_is_primary_device(struct fb_info *info);

#define fb_is_primary_device fb_is_primary_device



static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)

static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)

{

	sbus_memcpy_fromio(to, from, n);

}

#define fb_memcpy_fromfb fb_memcpy_fromfb

#define fb_memcpy_fromio fb_memcpy_fromio



static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)

static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)

{

	sbus_memcpy_toio(to, from, n);

}

#define fb_memcpy_tofb fb_memcpy_tofb

#define fb_memcpy_toio fb_memcpy_toio



static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)

static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)

{

	sbus_memset_io(addr, c, n);

}

#define fb_memset fb_memset

#define fb_memset fb_memset_io



#include <asm-generic/fb.h>

drivers/video/fbdev/aty/mach64_cursor.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor) 
	    u8 m, b;



	    // Clear cursor image with 1010101010...

	    fb_memset(dst, 0xaa, 1024);

	    fb_memset_io(dst, 0xaa, 1024);



	    offset = align - width*2;

drivers/video/fbdev/chipsfb.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static const struct fb_var_screeninfo chipsfb_var = { 


static void init_chips(struct fb_info *p, unsigned long addr)

{

	fb_memset(p->screen_base, 0, 0x100000);

	fb_memset_io(p->screen_base, 0, 0x100000);



	p->fix = chipsfb_fix;

	p->fix.smem_start = addr;