diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-29 23:32:12 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-05-03 18:07:50 +0300 |
commit | 2fd001cd36005846caa6456fff1008c6f5bae9d4 (patch) | |
tree | 281b12151496d108fa606eddebbe661a3fc2c2c6 /arch/x86 | |
parent | f178e96de7f0868e1b4d6df687794961f30125f2 (diff) | |
download | linux-2fd001cd36005846caa6456fff1008c6f5bae9d4.tar.xz |
arch: Rename fbdev header and source files
The per-architecture fbdev code has no dependencies on fbdev and can
be used for any video-related subsystem. Rename the files to 'video'.
Use video-sti.c on parisc as the source file depends on CONFIG_STI_CORE.
On arc, arm, arm64, sh, and um the asm header file is an empty wrapper
around the file in asm-generic. Let Kbuild generate the file. The build
system does this automatically. Only um needs to generate video.h
explicitly, so that it overrides the host architecture's header. The
latter would otherwise interfere with the build.
Further update all includes statements, include guards, and Makefiles.
Also update a few strings and comments to refer to video instead of
fbdev.
v3:
- arc, arm, arm64, sh: generate asm header via build system (Sam,
Helge, Arnd)
- um: rename fb.h to video.h
- fix typo in commit message (Sam)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/video.h (renamed from arch/x86/include/asm/fb.h) | 8 | ||||
-rw-r--r-- | arch/x86/video/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/video/video.c (renamed from arch/x86/video/fbdev.c) | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/video.h index 999db3379286..0950c9535fae 100644 --- a/arch/x86/include/asm/fb.h +++ b/arch/x86/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_FB_H -#define _ASM_X86_FB_H +#ifndef _ASM_X86_VIDEO_H +#define _ASM_X86_VIDEO_H #include <linux/types.h> @@ -16,6 +16,6 @@ pgprot_t pgprot_framebuffer(pgprot_t prot, bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_X86_FB_H */ +#endif /* _ASM_X86_VIDEO_H */ diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index 9dd82880a027..fdf83a408d75 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += fbdev.o +obj-y += video.o diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/video.c index 4d87ce8e257f..81fc97a2a837 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/video.c @@ -10,7 +10,8 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/vgaarb.h> -#include <asm/fb.h> + +#include <asm/video.h> pgprot_t pgprot_framebuffer(pgprot_t prot, unsigned long vm_start, unsigned long vm_end, |