niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

arch/sparc: Implement fb_is_primary_device() in source file

Browse source 
Other architectures implment fb_is_primary_device() in a source
file. Do the same on sparc. No functional changes, but allows to
remove several include statement from <asm/fb.h>.

v2:
	* don't include <asm/prom.h> in header file

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Helge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230417125651.25126-18-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-04-17 14:56:49 +02:00
parent b6cf29637b
commit 4eec0b3048
4 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/sparc/Makefile
View file

@ -60,6 +60,7 @@ libs-y += arch/sparc/prom/
libs-y += arch/sparc/lib/ libs-y += arch/sparc/lib/
drivers-$(CONFIG_PM) += arch/sparc/power/ drivers-$(CONFIG_PM) += arch/sparc/power/
drivers-$(CONFIG_FB) += arch/sparc/video/
boot := arch/sparc/boot boot := arch/sparc/boot

23
arch/sparc/include/asm/fb.h
View file

@ -1,11 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _SPARC_FB_H_ #ifndef _SPARC_FB_H_
#define _SPARC_FB_H_ #define _SPARC_FB_H_
#include <linux/console.h>
#include <linux/fb.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/prom.h>
struct fb_info;
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
unsigned long off) unsigned long off)
@ -15,20 +16,6 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
#endif #endif
} }
static inline int fb_is_primary_device(struct fb_info *info) int fb_is_primary_device(struct fb_info *info);
{
struct device *dev = info->device;
struct device_node *node;
if (console_set_on_cmdline)
return 0;
node = dev->of_node;
if (node &&
node == of_console_device)
return 1;
return 0;
}
#endif /* _SPARC_FB_H_ */ #endif /* _SPARC_FB_H_ */

3
arch/sparc/video/Makefile Normal file
View file

@ -0,0 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_FB) += fbdev.o

24
arch/sparc/video/fbdev.c Normal file
View file

@ -0,0 +1,24 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/console.h>
#include <linux/fb.h>
#include <linux/module.h>
#include <asm/fb.h>
#include <asm/prom.h>
int fb_is_primary_device(struct fb_info *info)
{
struct device *dev = info->device;
struct device_node *node;
if (console_set_on_cmdline)
return 0;
node = dev->of_node;
if (node && node == of_console_device)
return 1;
return 0;
}
EXPORT_SYMBOL(fb_is_primary_device);