[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230405150554.30540-8-tzimmermann@suse.de>
Date: Wed, 5 Apr 2023 17:05:43 +0200
From: Thomas Zimmermann <tzimmermann@...e.de>
To: arnd@...db.de, daniel.vetter@...ll.ch, deller@....de,
javierm@...hat.com, gregkh@...uxfoundation.org
Cc: linux-arch@...r.kernel.org, linux-fbdev@...r.kernel.org,
dri-devel@...ts.freedesktop.org,
linux-snps-arc@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-ia64@...r.kernel.org,
loongarch@...ts.linux.dev, linux-m68k@...ts.linux-m68k.org,
linux-mips@...r.kernel.org, linux-parisc@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org, linux-sh@...r.kernel.org,
sparclinux@...r.kernel.org, x86@...nel.org,
Thomas Zimmermann <tzimmermann@...e.de>,
Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: [PATCH 07/18] arch/m68k: Implement <asm/fb.h> with generic helpers
Replace the architecture's fb_is_primary_device() with the generic
one from <asm-generic/fb.h>. No functional changes. Also use the
generic helper for fb_pgprotect() on systems without MMU.
Signed-off-by: Thomas Zimmermann <tzimmermann@...e.de>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
---
arch/m68k/include/asm/fb.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
index b86c6e2e26dd..f15a14e36826 100644
--- a/arch/m68k/include/asm/fb.h
+++ b/arch/m68k/include/asm/fb.h
@@ -2,8 +2,8 @@
#ifndef _ASM_FB_H_
#define _ASM_FB_H_
-#include <linux/fb.h>
#include <linux/fs.h>
+
#include <asm/page.h>
#include <asm/setup.h>
@@ -27,13 +27,9 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
}
}
#endif /* CONFIG_SUN3 */
-#else
-#define fb_pgprotect(...) do {} while (0)
+#define fb_pgprotect fb_pgprotect
#endif /* CONFIG_MMU */
-static inline int fb_is_primary_device(struct fb_info *info)
-{
- return 0;
-}
+#include <asm-generic/fb.h>
#endif /* _ASM_FB_H_ */
--
2.40.0
Powered by blists - more mailing lists