Commit 4eec0b30 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

arch/sparc: Implement fb_is_primary_device() in source file 



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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230417125651.25126-18-tzimmermann@suse.de
parent b6cf2963

arch/sparc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ libs-y += arch/sparc/prom/ 
libs-y                 += arch/sparc/lib/



drivers-$(CONFIG_PM) += arch/sparc/power/

drivers-$(CONFIG_FB) += arch/sparc/video/



boot := arch/sparc/boot

arch/sparc/include/asm/fb.h

+5 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _SPARC_FB_H_

#define _SPARC_FB_H_

#include <linux/console.h>

#include <linux/fb.h>



#include <linux/fs.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,

				unsigned long off)
@@ -15,20 +16,6 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, 
#endif

}



static inline 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;

}

int fb_is_primary_device(struct fb_info *info);



#endif /* _SPARC_FB_H_ */

arch/sparc/video/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_FB) += fbdev.o

arch/sparc/video/fbdev.c

0 → 100644
+24 −0
Original line number Diff line number Diff line 
// 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);