Messages in this thread Patch in this message | | | From | Thomas Zimmermann <> | Subject | [PATCH v2 14/19] arch/parisc: Implement <asm/fb.h> with generic helpers | Date | Thu, 6 Apr 2023 16:30:14 +0200 |
| |
Replace the architecture's fb_is_primary_device() with the generic one from <asm-generic/fb.h> on systems without CONFIG_STI_CORE. No functional changes.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> --- arch/parisc/include/asm/fb.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/fb.h index 0b9a38ced5c8..66bb401c0cda 100644 --- a/arch/parisc/include/asm/fb.h +++ b/arch/parisc/include/asm/fb.h @@ -2,23 +2,24 @@ #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> #include <asm/page.h> +#include <asm/pgtable.h> + +struct fb_info; +struct file; static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; } +#define fb_pgprotect fb_pgprotect #if defined(CONFIG_STI_CORE) int fb_is_primary_device(struct fb_info *info); -#else -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} +#define fb_is_primary_device fb_is_primary_device #endif +#include <asm-generic/fb.h> + #endif /* _ASM_FB_H_ */ -- 2.40.0
| |