| Message ID | 20230406143019.6709-10-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | arch: Consolidate <asm/fb.h> | expand |
On Thu, Apr 6, 2023, at 16:30, Thomas Zimmermann wrote: > Replace the architecture's fb_is_primary_device() with the generic > one from <asm-generic/fb.h>. No functional changes. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> I think you should at least mention that the existing fb_pgprotect() function is probably incorrect and should be replaced with the generic version. For reference, the fb_pgprotect function using pgprot_uncached() was introduced in 2.6.22 along with all the other ones, but the pgprot_writecombine function was only added in commit 4b050ba7a66c ("MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS") for 3.18. Arnd
diff --git a/arch/mips/include/asm/fb.h b/arch/mips/include/asm/fb.h index bd3f68c9ddfc..6bda0a81d8ca 100644 --- a/arch/mips/include/asm/fb.h +++ b/arch/mips/include/asm/fb.h @@ -1,19 +1,17 @@ #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> #include <asm/page.h> +struct file; + static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); } +#define fb_pgprotect fb_pgprotect -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} +#include <asm-generic/fb.h> #endif /* _ASM_FB_H_ */
Replace the architecture's fb_is_primary_device() with the generic one from <asm-generic/fb.h>. No functional changes. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- arch/mips/include/asm/fb.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)